commit 86808c205b7dec478c5d4e87d3408ff2956da73e
author Mahesh Bireddy <mahesh.reddybireddy@arm.com> Tue Jan 07 12:13:29 2020 +0530
committer Andrew Scull <ascull@google.com> Thu Jan 09 10:33:48 2020 +0000
tree ace70a4686594c45ec5cca3480313d00ea798c4c
parent 9c3c29f4c7d142eee1faf9d81e2df088dce18823

Bug fix: Primary vm should be given the physical core IDs.

Previously for primary vm also passing mapped cpu_index rather than the
physcial core ID.

Signed-off-by: Mahesh Bireddy <mahesh.reddybireddy@arm.com>
Change-Id: I7c26e4da2a532cc1ea5b318e5ee503532b51671c

src/arch/aarch64/hypervisor/cpu.c

diff --git a/src/arch/aarch64/hypervisor/cpu.c b/src/arch/aarch64/hypervisor/cpu.c
index eadca3b..adb5b12 100644
--- a/src/arch/aarch64/hypervisor/cpu.c
+++ b/src/arch/aarch64/hypervisor/cpu.c
@@ -69,7 +69,7 @@
 {
 	spci_vm_id_t vm_id = vcpu->vm->id;
 	bool is_primary = vm_id == HF_PRIMARY_VM_ID;
-	cpu_id_t vcpu_id = vcpu_index(vcpu);
+	cpu_id_t vcpu_id = is_primary ? vcpu->cpu->id : vcpu_index(vcpu);
 	paddr_t table = vcpu->vm->ptable.root;
 	struct arch_regs *r = &vcpu->regs;
 	uintreg_t pc = r->pc;