Add helper functions for VM/vCPU IDs in SPCI calls.
This also changes all calls to encode VM IDs in high bits, vCPU index in
low bits. This is inconsistent with the current spec but is what we
expect it to be corrected to in the next draft.
Change-Id: I3da130b9070c6c43856509ba80b532e7e8c263e0
diff --git a/src/arch/aarch64/hypervisor/handler.c b/src/arch/aarch64/hypervisor/handler.c
index f976eee..1125dcf 100644
--- a/src/arch/aarch64/hypervisor/handler.c
+++ b/src/arch/aarch64/hypervisor/handler.c
@@ -345,8 +345,8 @@
*args = api_spci_msg_recv(false, current(), next);
return true;
case SPCI_RUN_32:
- *args = api_spci_run((args->arg1 >> 16) & 0xffff,
- args->arg1 & 0xffff, current(), next);
+ *args = api_spci_run(spci_vm_id(*args), spci_vcpu_index(*args),
+ current(), next);
return true;
}