From 5b8c7a5b23a8bc09f2bf1287e77f7accbd6328cd Mon Sep 17 00:00:00 2001 From: Sainath Grandhi Date: Thu, 16 Aug 2018 00:34:59 -0700 Subject: [PATCH] hv: VM BSP vcpu mode for ACRN partition mode BSPs for VMs booted in ACRN partition mode start in protected mode. Signed-off-by: Sainath Grandhi --- hypervisor/arch/x86/guest/vcpu.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hypervisor/arch/x86/guest/vcpu.c b/hypervisor/arch/x86/guest/vcpu.c index 9eb37b408..a2bd38a0c 100644 --- a/hypervisor/arch/x86/guest/vcpu.c +++ b/hypervisor/arch/x86/guest/vcpu.c @@ -494,6 +494,9 @@ int prepare_vcpu(struct vm *vm, uint16_t pcpu_id) /* Load VM SW */ if (!vm_sw_loader) vm_sw_loader = general_sw_loader; +#ifdef CONFIG_PARTITION_MODE + vcpu->arch_vcpu.cpu_mode = CPU_MODE_PROTECTED; +#else if (is_vm0(vcpu->vm)) { struct boot_ctx *vm0_init_ctx = (struct boot_ctx *)vm0_boot_context; @@ -515,6 +518,7 @@ int prepare_vcpu(struct vm *vm, uint16_t pcpu_id) vcpu->arch_vcpu.cpu_mode = CPU_MODE_REAL; #endif } +#endif //CONFIG_PARTITION_MODE vm_sw_loader(vm, vcpu); } else { vcpu->arch_vcpu.cpu_mode = CPU_MODE_REAL;