Merge remote-tracking branch 'kiszka/master'

[jailhouse.git] / hypervisor / arch / x86 / include / asm / vcpu.h

diff --git a/hypervisor/arch/x86/include/asm/vcpu.h b/hypervisor/arch/x86/include/asm/vcpu.h
index f43e6ef3480aafc87309cfc048d55d0118137798..f1d7a4d2937916cf85219630c71b4bd62f4b3f93 100644 (file)
--- a/hypervisor/arch/x86/include/asm/vcpu.h
+++ b/hypervisor/arch/x86/include/asm/vcpu.h
@@ -13,11 +13,10 @@
 #ifndef _JAILHOUSE_ASM_VCPU_H
 #define _JAILHOUSE_ASM_VCPU_H
 
-#include <jailhouse/entry.h>
+#include <jailhouse/cell.h>
 #include <jailhouse/cell-config.h>
+#include <jailhouse/entry.h>
 #include <jailhouse/paging.h>
-#include <jailhouse/types.h>
-#include <asm/cell.h>
 #include <asm/percpu.h>
 #include <asm/processor.h>
 
@@ -110,11 +109,14 @@ void vcpu_handle_hypercall(void);
 bool vcpu_handle_io_access(void);
 bool vcpu_handle_mmio_access(void);
 
-bool vcpu_handle_msr_read(union registers *guest_regs);
-bool vcpu_handle_msr_write(union registers *guest_regs);
+bool vcpu_handle_msr_read(void);
+bool vcpu_handle_msr_write(void);
+
+void vcpu_handle_cpuid(void);
 
 bool vcpu_handle_xsetbv(void);
 
-void vcpu_reset(void);
+void vcpu_reset(unsigned int sipi_vector);
+void vcpu_vendor_reset(unsigned int sipi_vector);
 
 #endif