diff options
author | Avi Kivity <avi@redhat.com> | 2009-01-04 05:39:07 -0500 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2009-03-24 05:02:55 -0400 |
commit | 1c08364c3565242f1e1bd585bc2ce458967941af (patch) | |
tree | 641d6f012c3c7825223146604aa2db0fad795bef | |
parent | 52d939a0bf44081bc9f69b4fbdc9e7f416df27c7 (diff) |
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>
-rw-r--r-- | arch/x86/include/asm/kvm_host.h | 12 | ||||
-rw-r--r-- | include/linux/kvm_types.h | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index b74576aec19a..863ea73431ad 100644 --- 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 { | |||
227 | char buf[512] __aligned(sizeof(long)); | 227 | char buf[512] __aligned(sizeof(long)); |
228 | }; | 228 | }; |
229 | 229 | ||
230 | struct kvm_pio_request { | ||
231 | unsigned long count; | ||
232 | int cur_count; | ||
233 | gva_t guest_gva; | ||
234 | int in; | ||
235 | int port; | ||
236 | int size; | ||
237 | int string; | ||
238 | int down; | ||
239 | int rep; | ||
240 | }; | ||
241 | |||
230 | /* | 242 | /* |
231 | * x86 supports 3 paging modes (4-level 64-bit, 3-level 64-bit, and 2-level | 243 | * x86 supports 3 paging modes (4-level 64-bit, 3-level 64-bit, and 2-level |
232 | * 32-bit). The kvm_mmu structure abstracts the details of the current mmu | 244 | * 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 5f4a18cae26b..2b8318c83e53 100644 --- a/include/linux/kvm_types.h +++ b/include/linux/kvm_types.h | |||
@@ -40,16 +40,4 @@ typedef unsigned long hfn_t; | |||
40 | 40 | ||
41 | typedef hfn_t pfn_t; | 41 | typedef hfn_t pfn_t; |
42 | 42 | ||
43 | struct kvm_pio_request { | ||
44 | unsigned long count; | ||
45 | int cur_count; | ||
46 | gva_t guest_gva; | ||
47 | int in; | ||
48 | int port; | ||
49 | int size; | ||
50 | int string; | ||
51 | int down; | ||
52 | int rep; | ||
53 | }; | ||
54 | |||
55 | #endif /* __KVM_TYPES_H__ */ | 43 | #endif /* __KVM_TYPES_H__ */ |