From e35f27a525160548fba0c286b8f8549b36707416 Mon Sep 17 00:00:00 2001 From: Victor Sun Date: Tue, 2 Apr 2019 12:48:40 +0800 Subject: [PATCH] HV: add clos initialization in vm_config The CLOS is initialized to 0 for each scenarios. User could modify this configuration in its vm_configurations.h; Tracked-On: #2291 Signed-off-by: Victor Sun Acked-by: Eddie Dong --- hypervisor/arch/x86/configs/vm_config.c | 1 + hypervisor/scenarios/logical_partition/vm_configurations.h | 2 ++ hypervisor/scenarios/sdc/vm_configurations.h | 1 + 3 files changed, 4 insertions(+) diff --git a/hypervisor/arch/x86/configs/vm_config.c b/hypervisor/arch/x86/configs/vm_config.c index c410cc2b8..4a8368e3f 100644 --- a/hypervisor/arch/x86/configs/vm_config.c +++ b/hypervisor/arch/x86/configs/vm_config.c @@ -19,6 +19,7 @@ .name = VM##idx##_CONFIG_NAME, \ .pcpu_bitmap = VM##idx##_CONFIG_PCPU_BITMAP, \ .guest_flags = VM##idx##_CONFIG_FLAGS, \ + .clos = VM##idx##_CONFIG_CLOS, \ .memory = { \ .start_hpa = VM##idx##_CONFIG_MEM_START_HPA, \ .size = VM##idx##_CONFIG_MEM_SIZE, \ diff --git a/hypervisor/scenarios/logical_partition/vm_configurations.h b/hypervisor/scenarios/logical_partition/vm_configurations.h index 49d736c80..095aef215 100644 --- a/hypervisor/scenarios/logical_partition/vm_configurations.h +++ b/hypervisor/scenarios/logical_partition/vm_configurations.h @@ -25,6 +25,7 @@ #define VM0_CONFIG_TYPE PRE_LAUNCHED_VM #define VM0_CONFIG_PCPU_BITMAP (PLUG_CPU(0) | PLUG_CPU(2)) #define VM0_CONFIG_FLAGS GUEST_FLAG_IO_COMPLETION_POLLING +#define VM0_CONFIG_CLOS 0U #define VM0_CONFIG_MEM_START_HPA 0x100000000UL #define VM0_CONFIG_MEM_SIZE 0x20000000UL @@ -45,6 +46,7 @@ #define VM1_CONFIG_TYPE PRE_LAUNCHED_VM #define VM1_CONFIG_PCPU_BITMAP (PLUG_CPU(1) | PLUG_CPU(3)) #define VM1_CONFIG_FLAGS GUEST_FLAG_IO_COMPLETION_POLLING +#define VM1_CONFIG_CLOS 0U #define VM1_CONFIG_MEM_START_HPA 0x120000000UL #define VM1_CONFIG_MEM_SIZE 0x20000000UL diff --git a/hypervisor/scenarios/sdc/vm_configurations.h b/hypervisor/scenarios/sdc/vm_configurations.h index f32df091f..1fcef9b20 100644 --- a/hypervisor/scenarios/sdc/vm_configurations.h +++ b/hypervisor/scenarios/sdc/vm_configurations.h @@ -17,6 +17,7 @@ #define VM0_CONFIG_TYPE SOS_VM #define VM0_CONFIG_PCPU_BITMAP 0UL /* PCPU Bitmap is reserved in SOS_VM */ #define VM0_CONFIG_FLAGS GUEST_FLAG_IO_COMPLETION_POLLING +#define VM0_CONFIG_CLOS 0U #define VM0_CONFIG_MEM_START_HPA 0UL #define VM0_CONFIG_MEM_SIZE CONFIG_SOS_RAM_SIZE #define VM0_CONFIG_OS_NAME "ACRN Service OS"