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 4e0d9b55a9305e91cc7e3da6065b41f0a8c716ce..f1d7a4d2937916cf85219630c71b4bd62f4b3f93 100644 (file)
--- a/hypervisor/arch/x86/include/asm/vcpu.h
+++ b/hypervisor/arch/x86/include/asm/vcpu.h
@@ -13,19 +13,43 @@
 #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>
 
+#define X86_CR0_HOST_STATE \
+       (X86_CR0_PG | X86_CR0_WP | X86_CR0_NE | X86_CR0_ET | X86_CR0_TS | \
+        X86_CR0_MP | X86_CR0_PE)
+#define X86_CR4_HOST_STATE     X86_CR4_PAE
+
 struct vcpu_io_bitmap {
        u8 *data;
        u32 size;
 };
 
+struct vcpu_execution_state {
+       u64 efer;
+       u64 rflags;
+       u16 cs;
+       u64 rip;
+};
+
+struct vcpu_io_intercept {
+       u16 port;
+       unsigned int size;
+       bool in;
+       unsigned int inst_len;
+       bool rep_or_str;
+};
+
+struct vcpu_mmio_intercept {
+       u64 phys_addr;
+       bool is_write;
+};
+
 int vcpu_vendor_init(void);
 
 int vcpu_cell_init(struct cell *cell);
@@ -42,15 +66,15 @@ 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 vcpu_handle_exit(struct registers *guest_regs, struct per_cpu *cpu_data);
+void __attribute__((noreturn)) vcpu_deactivate_vmm(void);
 
-void vcpu_park(struct per_cpu *cpu_data);
+void vcpu_handle_exit(struct per_cpu *cpu_data);
 
-void vcpu_nmi_handler(struct per_cpu *cpu_data);
+void vcpu_park(void);
 
-void vcpu_tlb_flush(void);
+void vcpu_nmi_handler(void);
 
-void vcpu_entry_failure(struct per_cpu *cpu_data);
+void vcpu_tlb_flush(void);
 
 /*
  * vcpu_map_inst() and vcpu_get_inst_bytes() contract:
@@ -72,6 +96,27 @@ void vcpu_skip_emulated_instruction(unsigned int inst_len);
 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);
+
 bool vcpu_get_guest_paging_structs(struct guest_paging_structures *pg_structs);
 
+void vcpu_vendor_set_guest_pat(unsigned long val);
+
+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_xsetbv(void);
+
+void vcpu_reset(unsigned int sipi_vector);
+void vcpu_vendor_reset(unsigned int sipi_vector);
+
 #endif