diff options
Diffstat (limited to 'arch/x86/include/asm/kvm_host.h')
-rw-r--r-- | arch/x86/include/asm/kvm_host.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index e5b97be12d2a..db7c1f2709a2 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h | |||
@@ -173,6 +173,9 @@ enum { | |||
173 | #define DR7_FIXED_1 0x00000400 | 173 | #define DR7_FIXED_1 0x00000400 |
174 | #define DR7_VOLATILE 0xffff23ff | 174 | #define DR7_VOLATILE 0xffff23ff |
175 | 175 | ||
176 | /* apic attention bits */ | ||
177 | #define KVM_APIC_CHECK_VAPIC 0 | ||
178 | |||
176 | /* | 179 | /* |
177 | * We don't want allocation failures within the mmu code, so we preallocate | 180 | * We don't want allocation failures within the mmu code, so we preallocate |
178 | * enough memory for a single page fault in a cache. | 181 | * enough memory for a single page fault in a cache. |
@@ -238,8 +241,6 @@ struct kvm_mmu_page { | |||
238 | #endif | 241 | #endif |
239 | 242 | ||
240 | int write_flooding_count; | 243 | int write_flooding_count; |
241 | |||
242 | struct rcu_head rcu; | ||
243 | }; | 244 | }; |
244 | 245 | ||
245 | struct kvm_pio_request { | 246 | struct kvm_pio_request { |
@@ -338,6 +339,7 @@ struct kvm_vcpu_arch { | |||
338 | u64 efer; | 339 | u64 efer; |
339 | u64 apic_base; | 340 | u64 apic_base; |
340 | struct kvm_lapic *apic; /* kernel irqchip context */ | 341 | struct kvm_lapic *apic; /* kernel irqchip context */ |
342 | unsigned long apic_attention; | ||
341 | int32_t apic_arb_prio; | 343 | int32_t apic_arb_prio; |
342 | int mp_state; | 344 | int mp_state; |
343 | int sipi_vector; | 345 | int sipi_vector; |
@@ -537,8 +539,6 @@ struct kvm_arch { | |||
537 | u64 hv_guest_os_id; | 539 | u64 hv_guest_os_id; |
538 | u64 hv_hypercall; | 540 | u64 hv_hypercall; |
539 | 541 | ||
540 | atomic_t reader_counter; | ||
541 | |||
542 | #ifdef CONFIG_KVM_MMU_AUDIT | 542 | #ifdef CONFIG_KVM_MMU_AUDIT |
543 | int audit_point; | 543 | int audit_point; |
544 | #endif | 544 | #endif |
@@ -713,8 +713,9 @@ void kvm_mmu_set_mask_ptes(u64 user_mask, u64 accessed_mask, | |||
713 | 713 | ||
714 | int kvm_mmu_reset_context(struct kvm_vcpu *vcpu); | 714 | int kvm_mmu_reset_context(struct kvm_vcpu *vcpu); |
715 | void kvm_mmu_slot_remove_write_access(struct kvm *kvm, int slot); | 715 | void kvm_mmu_slot_remove_write_access(struct kvm *kvm, int slot); |
716 | int kvm_mmu_rmap_write_protect(struct kvm *kvm, u64 gfn, | 716 | void kvm_mmu_write_protect_pt_masked(struct kvm *kvm, |
717 | struct kvm_memory_slot *slot); | 717 | struct kvm_memory_slot *slot, |
718 | gfn_t gfn_offset, unsigned long mask); | ||
718 | void kvm_mmu_zap_all(struct kvm *kvm); | 719 | void kvm_mmu_zap_all(struct kvm *kvm); |
719 | unsigned int kvm_mmu_calculate_mmu_pages(struct kvm *kvm); | 720 | unsigned int kvm_mmu_calculate_mmu_pages(struct kvm *kvm); |
720 | void kvm_mmu_change_mmu_pages(struct kvm *kvm, unsigned int kvm_nr_mmu_pages); | 721 | void kvm_mmu_change_mmu_pages(struct kvm *kvm, unsigned int kvm_nr_mmu_pages); |