KVM: Portability: Move memslot aliases to new struct kvm_arch

This patches create kvm_arch to hold arch-specific kvm fileds
and moves fields naliases and aliases to kvm_arch.

Signed-off-by: Zhang Xiantao <xiantao.zhang@intel.com>
Acked-by: Carsten Otte <cotte@de.ibm.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>

1 files changed, 1 insertions, 9 deletions

diff --git a/drivers/kvm/kvm.h b/drivers/kvm/kvm.h
index 9ea7149e741d..bf5b85c1f094 100644
--- a/drivers/kvm/kvm.h
+++ b/drivers/kvm/kvm.h
@@ -25,7 +25,6 @@
 #include "x86.h"
 
 #define KVM_MAX_VCPUS 4
-#define KVM_ALIAS_SLOTS 4
 #define KVM_MEMORY_SLOTS 8
 /* memory slots that does not exposed to userspace */
 #define KVM_PRIVATE_MEM_SLOTS 4
@@ -94,12 +93,6 @@ struct kvm_vcpu {
         struct kvm_vcpu_arch arch;
 };
 
-struct kvm_mem_alias {
-        gfn_t base_gfn;
-        unsigned long npages;
-        gfn_t target_gfn;
-};
-
 struct kvm_memory_slot {
         gfn_t base_gfn;
         unsigned long npages;
@@ -123,8 +116,6 @@ struct kvm_vm_stat {
 struct kvm {
         struct mutex lock; /* protects everything except vcpus */
         struct mm_struct *mm; /* userspace tied to this vm */
-        int naliases;
-        struct kvm_mem_alias aliases[KVM_ALIAS_SLOTS];
         int nmemslots;
         struct kvm_memory_slot memslots[KVM_MEMORY_SLOTS +
                                         KVM_PRIVATE_MEM_SLOTS];
@@ -147,6 +138,7 @@ struct kvm {
         unsigned int tss_addr;
         struct page *apic_access_page;
         struct kvm_vm_stat stat;
+        struct kvm_arch arch;
 };
 
 /* The guest did something we don't support. */