--- arch/x86/include/asm/kvm_host.h

+++ arch/x86/include/asm/kvm_host.h

@@ -193,6 +193,7 @@ union kvm_mmu_page_role {

unsigned invalid:1;

unsigned cr4_pge:1;

unsigned nxe:1;

+ unsigned cr0_wp:1;

};

};

@@ -256,7 +257,8 @@ struct kvm_mmu {

void (*new_cr3)(struct kvm_vcpu *vcpu);

int (*page_fault)(struct kvm_vcpu *vcpu, gva_t gva, u32 err);

void (*free)(struct kvm_vcpu *vcpu);

- gpa_t (*gva_to_gpa)(struct kvm_vcpu *vcpu, gva_t gva);

+ gpa_t (*gva_to_gpa)(struct kvm_vcpu *vcpu, gva_t gva, u32 access,

+ u32 *error);

void (*prefetch_page)(struct kvm_vcpu *vcpu,

struct kvm_mmu_page *page);

int (*sync_page)(struct kvm_vcpu *vcpu,

@@ -601,8 +603,7 @@ int emulator_set_dr(struct x86_emulate_c

unsigned long value);

void kvm_get_segment(struct kvm_vcpu *vcpu, struct kvm_segment *var, int seg);

-int kvm_load_segment_descriptor(struct kvm_vcpu *vcpu, u16 selector,

- int type_bits, int seg);

+int kvm_load_segment_descriptor(struct kvm_vcpu *vcpu, u16 selector, int seg);

int kvm_task_switch(struct kvm_vcpu *vcpu, u16 tss_selector, int reason);

@@ -645,6 +646,10 @@ void __kvm_mmu_free_some_pages(struct kv

int kvm_mmu_load(struct kvm_vcpu *vcpu);

void kvm_mmu_unload(struct kvm_vcpu *vcpu);

void kvm_mmu_sync_roots(struct kvm_vcpu *vcpu);

+gpa_t kvm_mmu_gva_to_gpa_read(struct kvm_vcpu *vcpu, gva_t gva, u32 *error);

+gpa_t kvm_mmu_gva_to_gpa_fetch(struct kvm_vcpu *vcpu, gva_t gva, u32 *error);

+gpa_t kvm_mmu_gva_to_gpa_write(struct kvm_vcpu *vcpu, gva_t gva, u32 *error);

+gpa_t kvm_mmu_gva_to_gpa_system(struct kvm_vcpu *vcpu, gva_t gva, u32 *error);

int kvm_emulate_hypercall(struct kvm_vcpu *vcpu);

@@ -658,6 +663,7 @@ void kvm_disable_tdp(void);

int load_pdptrs(struct kvm_vcpu *vcpu, unsigned long cr3);

int complete_pio(struct kvm_vcpu *vcpu);

+bool kvm_check_iopl(struct kvm_vcpu *vcpu);

struct kvm_memory_slot *gfn_to_memslot_unaliased(struct kvm *kvm, gfn_t gfn);