diff options
author | Avi Kivity <avi@redhat.com> | 2010-06-21 04:44:20 -0400 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2010-08-01 03:47:00 -0400 |
commit | a1f4d39500ad8ed61825eff061debff42386ab5b (patch) | |
tree | 58b72188b1356329e78951773f4be41e66b11d21 /arch/x86/include | |
parent | fc34531db3cf8c422f2ff7cf4ef507a3ca672cd2 (diff) |
KVM: Remove memory alias support
As advertised in feature-removal-schedule.txt. Equivalent support is provided
by overlapping memory regions.
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/x86/include')
-rw-r--r-- | arch/x86/include/asm/kvm_host.h | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index 2ec2e27a403e..a57cdeacc4d2 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h | |||
@@ -69,8 +69,6 @@ | |||
69 | 69 | ||
70 | #define IOPL_SHIFT 12 | 70 | #define IOPL_SHIFT 12 |
71 | 71 | ||
72 | #define KVM_ALIAS_SLOTS 4 | ||
73 | |||
74 | #define KVM_PERMILLE_MMU_PAGES 20 | 72 | #define KVM_PERMILLE_MMU_PAGES 20 |
75 | #define KVM_MIN_ALLOC_MMU_PAGES 64 | 73 | #define KVM_MIN_ALLOC_MMU_PAGES 64 |
76 | #define KVM_MMU_HASH_SHIFT 10 | 74 | #define KVM_MMU_HASH_SHIFT 10 |
@@ -362,24 +360,7 @@ struct kvm_vcpu_arch { | |||
362 | u64 hv_vapic; | 360 | u64 hv_vapic; |
363 | }; | 361 | }; |
364 | 362 | ||
365 | struct kvm_mem_alias { | ||
366 | gfn_t base_gfn; | ||
367 | unsigned long npages; | ||
368 | gfn_t target_gfn; | ||
369 | #define KVM_ALIAS_INVALID 1UL | ||
370 | unsigned long flags; | ||
371 | }; | ||
372 | |||
373 | #define KVM_ARCH_HAS_UNALIAS_INSTANTIATION | ||
374 | |||
375 | struct kvm_mem_aliases { | ||
376 | struct kvm_mem_alias aliases[KVM_ALIAS_SLOTS]; | ||
377 | int naliases; | ||
378 | }; | ||
379 | |||
380 | struct kvm_arch { | 363 | struct kvm_arch { |
381 | struct kvm_mem_aliases *aliases; | ||
382 | |||
383 | unsigned int n_free_mmu_pages; | 364 | unsigned int n_free_mmu_pages; |
384 | unsigned int n_requested_mmu_pages; | 365 | unsigned int n_requested_mmu_pages; |
385 | unsigned int n_alloc_mmu_pages; | 366 | unsigned int n_alloc_mmu_pages; |
@@ -655,8 +636,6 @@ void kvm_disable_tdp(void); | |||
655 | int complete_pio(struct kvm_vcpu *vcpu); | 636 | int complete_pio(struct kvm_vcpu *vcpu); |
656 | bool kvm_check_iopl(struct kvm_vcpu *vcpu); | 637 | bool kvm_check_iopl(struct kvm_vcpu *vcpu); |
657 | 638 | ||
658 | struct kvm_memory_slot *gfn_to_memslot_unaliased(struct kvm *kvm, gfn_t gfn); | ||
659 | |||
660 | static inline struct kvm_mmu_page *page_header(hpa_t shadow_page) | 639 | static inline struct kvm_mmu_page *page_header(hpa_t shadow_page) |
661 | { | 640 | { |
662 | struct page *page = pfn_to_page(shadow_page >> PAGE_SHIFT); | 641 | struct page *page = pfn_to_page(shadow_page >> PAGE_SHIFT); |