From 0c93a1388cbf15875f7f0a6c62a66ea1a74e9f59 Mon Sep 17 00:00:00 2001 From: Sainath Grandhi Date: Thu, 16 Aug 2018 00:27:45 -0700 Subject: [PATCH] hv: sw_loader for VMs in ACRN partition mode ACRN in partition mode needs to boot VMs from HV. This patch make ACRN treat all VMs in the same way (as vm0) w.r.t. setting up the guest memory for kernel, bootargs and zeropage Signed-off-by: Sainath Grandhi --- hypervisor/common/vm_load.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hypervisor/common/vm_load.c b/hypervisor/common/vm_load.c index f28bd9d83..b382895d4 100644 --- a/hypervisor/common/vm_load.c +++ b/hypervisor/common/vm_load.c @@ -128,10 +128,13 @@ int general_sw_loader(struct vm *vm, struct vcpu *vcpu) pr_dbg("Loading guest to run-time location"); +/* ACRN in partiton mode boots all VMs without devicemodel */ +#ifndef CONFIG_PARTITION_MODE /* FIXME: set config according to predefined offset */ if (!is_vm0(vm)) { return load_guest(vm, vcpu); } +#endif /* calculate the kernel entry point */ zeropage = (struct zero_page *)sw_kernel->kernel_src_addr;