From c652e36afb9d4282747a75773525572276f5403d Mon Sep 17 00:00:00 2001 From: Mingqiang Chi Date: Tue, 27 Mar 2018 11:56:56 +0800 Subject: [PATCH] hv: Save secure world memory info into vm instead of vm0 A bugfix for saving secure world memory info. Maybe there are multiple UOS, each VM has its own secure world and normal world, should save memory info into individual VM. Signed-off-by: Mingqiang Chi Acked-by: Eddie Dong --- arch/x86/trusty.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/trusty.c b/arch/x86/trusty.c index 05f70cb45..eeaf505c7 100644 --- a/arch/x86/trusty.c +++ b/arch/x86/trusty.c @@ -152,9 +152,9 @@ void create_secure_world_ept(struct vm *vm, uint64_t gpa, /* Backup secure world info, will be used when * destroy secure world */ - vm0->sworld_control.sworld_memory.base_gpa = gpa; - vm0->sworld_control.sworld_memory.base_hpa = hpa; - vm0->sworld_control.sworld_memory.length = size; + vm->sworld_control.sworld_memory.base_gpa = gpa; + vm->sworld_control.sworld_memory.base_hpa = hpa; + vm->sworld_control.sworld_memory.length = size; mmu_invept(vm->current_vcpu); mmu_invept(vm0->current_vcpu);