KVM: Move struct kvm_pio_request into x86 kvm_host.h

This is an x86 specific stucture and has no business living in common code.

Signed-off-by: Avi Kivity <avi@redhat.com>

diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index b74576aec19acaac7ae11f3deeb01d8459b7c38c..863ea73431ad311a919a65dbee36af59fa9b36ea 100644 (file)
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -227,6 +227,18 @@ struct kvm_pv_mmu_op_buffer {
        char buf[512] __aligned(sizeof(long));
 };
 
+struct kvm_pio_request {
+       unsigned long count;
+       int cur_count;
+       gva_t guest_gva;
+       int in;
+       int port;
+       int size;
+       int string;
+       int down;
+       int rep;
+};
+
 /*
  * x86 supports 3 paging modes (4-level 64-bit, 3-level 64-bit, and 2-level
  * 32-bit).  The kvm_mmu structure abstracts the details of the current mmu

diff --git a/include/linux/kvm_types.h b/include/linux/kvm_types.h
index 5f4a18cae26be5d645b181d89753e941ccda59de..2b8318c83e531d8dcf5cd6e96c09f994f12eef2a 100644 (file)
--- a/include/linux/kvm_types.h
+++ b/include/linux/kvm_types.h
@@ -40,16 +40,4 @@ typedef unsigned long  hfn_t;
 
 typedef hfn_t pfn_t;
 
-struct kvm_pio_request {
-       unsigned long count;
-       int cur_count;
-       gva_t guest_gva;
-       int in;
-       int port;
-       int size;
-       int string;
-       int down;
-       int rep;
-};
-
 #endif /* __KVM_TYPES_H__ */