From 36aaaec359cddaf1a084dcd24c9298aa3e8f5fc8 Mon Sep 17 00:00:00 2001 From: Alex Pavey Date: Wed, 11 Nov 2020 15:23:46 -0500 Subject: [PATCH] vm_arm: align serial inputs to vm number This commit ensures the VM->Serial Server connection has the same attributes on per-build basis. "+1" is added to each attribute such that VM0 doesn't have a 0 badge, which is the same as having no badge. Signed-off-by: Chris Guikema --- components/VM_Arm/configurations/vm.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/components/VM_Arm/configurations/vm.h b/components/VM_Arm/configurations/vm.h index e7ab78c4..d5db43fd 100644 --- a/components/VM_Arm/configurations/vm.h +++ b/components/VM_Arm/configurations/vm.h @@ -137,10 +137,13 @@ time_server.simple = true; #define PER_VM_VIRTUAL_SERIAL_CONFIGURATION_DEF(num) \ + vm##num.serial_getchar_attributes = num + 1; \ + Vm##num.guest_putchar_attributes = num + 1; \ + vm##num.putchar_attributes = num + 1; \ + vm##num.batch_attributes = num + 1; \ vm##num.serial_getchar_shmem_size = 0x1000; \ vm##num.batch_shmem_size = 0x1000; \ #define VM_VIRTUAL_SERIAL_CONFIGURATION_DEF(vm_ids...) \ VM_VIRTUAL_SERIAL_GENERAL_CONFIGURATION_DEF() \ __CALL(PER_VM_VIRTUAL_SERIAL_CONFIGURATION_DEF, vm_ids) \ -