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 2224d7c49f7f367233f51631b2caeadea5e5045d..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>
 
@@ -46,7 +45,7 @@ struct vcpu_io_intercept {
        bool rep_or_str;
 };
 
-struct vcpu_pf_intercept {
+struct vcpu_mmio_intercept {
        u64 phys_addr;
        bool is_write;
 };
@@ -67,12 +66,11 @@ int vcpu_init(struct per_cpu *cpu_data);
 void vcpu_exit(struct per_cpu *cpu_data);
 
 void __attribute__((noreturn)) vcpu_activate_vmm(struct per_cpu *cpu_data);
-void __attribute__((noreturn))
-vcpu_deactivate_vmm(struct registers *guest_regs);
+void __attribute__((noreturn)) vcpu_deactivate_vmm(void);
 
-void vcpu_handle_exit(struct registers *guest_regs, struct per_cpu *cpu_data);
+void vcpu_handle_exit(struct per_cpu *cpu_data);
 
-void vcpu_park(struct per_cpu *cpu_data);
+void vcpu_park(void);
 
 void vcpu_nmi_handler(void);
 
@@ -99,19 +97,26 @@ void vcpu_vendor_get_cell_io_bitmap(struct cell *cell,
                                    struct vcpu_io_bitmap *out);
 
 void vcpu_vendor_get_execution_state(struct vcpu_execution_state *x_state);
+void vcpu_vendor_get_io_intercept(struct vcpu_io_intercept *io);
+void vcpu_vendor_get_mmio_intercept(struct vcpu_mmio_intercept *mmio);
 
-void vcpu_handle_hypercall(struct registers *guest_regs,
-                          struct vcpu_execution_state *x_state);
+bool vcpu_get_guest_paging_structs(struct guest_paging_structures *pg_structs);
 
-bool vcpu_handle_io_access(struct registers *guest_regs,
-                          struct vcpu_io_intercept *io);
+void vcpu_vendor_set_guest_pat(unsigned long val);
 
-bool vcpu_get_guest_paging_structs(struct guest_paging_structures *pg_structs);
+void vcpu_handle_hypercall(void);
+
+bool vcpu_handle_io_access(void);
+bool vcpu_handle_mmio_access(void);
+
+bool vcpu_handle_msr_read(void);
+bool vcpu_handle_msr_write(void);
+
+void vcpu_handle_cpuid(void);
 
-bool vcpu_handle_pt_violation(struct registers *guest_regs,
-                             struct vcpu_pf_intercept *pf);
+bool vcpu_handle_xsetbv(void);
 
-bool vcpu_handle_msr_read(struct registers *guest_regs);
-bool vcpu_handle_msr_write(struct registers *guest_regs);
+void vcpu_reset(unsigned int sipi_vector);
+void vcpu_vendor_reset(unsigned int sipi_vector);
 
 #endif