commit b037d5b909c679b210336e852d0141e5df539eec
author Andrew Walbran <qwandor@google.com> Tue Jun 25 17:19:41 2019 +0100
committer Andrew Walbran <qwandor@google.com> Thu Jun 27 18:18:03 2019 +0100
tree 95be8acbf2191877cce8c8be5dbb0ae9b0bdc7cd
parent 52d9967781b9a15df54eb5cd1c4e873a471be86a

Introduce typedef for vCPU index.

Change-Id: I51194706edb86811487f2a22b3bda5405e605b5e

src/cpu.c

diff --git a/src/cpu.c b/src/cpu.c
index affba4a..eeea904 100644
--- a/src/cpu.c
+++ b/src/cpu.c
@@ -22,6 +22,7 @@
 
 #include "hf/api.h"
 #include "hf/dlog.h"
+#include "hf/spci.h"
 #include "hf/std.h"
 #include "hf/vm.h"
 
@@ -203,9 +204,12 @@
 	vcpu.vcpu->state = VCPU_STATE_READY;
 }
 
-size_t vcpu_index(const struct vcpu *vcpu)
+spci_vcpu_index_t vcpu_index(const struct vcpu *vcpu)
 {
-	return vcpu - vcpu->vm->vcpus;
+	size_t index = vcpu - vcpu->vm->vcpus;
+
+	assert(index < UINT16_MAX);
+	return index;
 }
 
 /**