From f6758fd6211c9dc523dbf9c3b0d56e6bc75ac82b Mon Sep 17 00:00:00 2001 From: Sainath Grandhi Date: Sat, 2 Mar 2019 22:38:39 -0800 Subject: [PATCH] hv: fix a redundant check in general_sw_loader vcpu returned by get_primary_vcpu API is BSP vcpu of the VM. So checking is_vcpu_bsp on vcpu is redundant. Tracked-On: #2668 Signed-off-by: Sainath Grandhi --- hypervisor/common/vm_load.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/hypervisor/common/vm_load.c b/hypervisor/common/vm_load.c index 5698b8933..4622a601d 100644 --- a/hypervisor/common/vm_load.c +++ b/hypervisor/common/vm_load.c @@ -121,12 +121,11 @@ int32_t general_sw_loader(struct acrn_vm *vm) } sw_kernel->kernel_entry_addr = (void *)((uint64_t)sw_kernel->kernel_load_addr + kernel_entry_offset); - if (is_vcpu_bsp(vcpu)) { - /* Set VCPU entry point to kernel entry */ - vcpu_set_rip(vcpu, (uint64_t)sw_kernel->kernel_entry_addr); - pr_info("%s, VM %hu VCPU %hu Entry: 0x%016llx ", __func__, vm->vm_id, vcpu->vcpu_id, - sw_kernel->kernel_entry_addr); - } + + /* Set VCPU entry point to kernel entry */ + vcpu_set_rip(vcpu, (uint64_t)sw_kernel->kernel_entry_addr); + pr_info("%s, VM %hu VCPU %hu Entry: 0x%016llx ", __func__, vm->vm_id, vcpu->vcpu_id, + sw_kernel->kernel_entry_addr); /* Copy the guest kernel image to its run-time location */ (void)copy_to_gpa(vm, sw_kernel->kernel_src_addr,