diff options
author | Jerone Young <jyoung5@us.ibm.com> | 2007-11-19 18:06:35 -0500 |
---|---|---|
committer | Avi Kivity <avi@qumranet.com> | 2008-01-30 10:53:08 -0500 |
commit | 3a56b20104f51bd6caf07e49fa1e3c09bee222e5 (patch) | |
tree | b0cb4975142644942361c17196c2470aae9fb4a0 | |
parent | d9ecf9281069c4c8dd429e1eb61cb7e0f3dda6b4 (diff) |
KVM: Portability: Move kvm_segment & kvm_dtable structure to <asm/kvm.h>
This patch moves structures:
kvm_segment
kvm_dtable
from include/linux/kvm.h to include/asm-x86/kvm.h
Signed-off-by: Jerone Young <jyoung5@us.ibm.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
-rw-r--r-- | include/asm-x86/kvm.h | 17 | ||||
-rw-r--r-- | include/linux/kvm.h | 15 |
2 files changed, 17 insertions, 15 deletions
diff --git a/include/asm-x86/kvm.h b/include/asm-x86/kvm.h index a2c65b5c4a85..644a325077f0 100644 --- a/include/asm-x86/kvm.h +++ b/include/asm-x86/kvm.h | |||
@@ -82,4 +82,21 @@ struct kvm_lapic_state { | |||
82 | char regs[KVM_APIC_REG_SIZE]; | 82 | char regs[KVM_APIC_REG_SIZE]; |
83 | }; | 83 | }; |
84 | 84 | ||
85 | struct kvm_segment { | ||
86 | __u64 base; | ||
87 | __u32 limit; | ||
88 | __u16 selector; | ||
89 | __u8 type; | ||
90 | __u8 present, dpl, db, s, l, g, avl; | ||
91 | __u8 unusable; | ||
92 | __u8 padding; | ||
93 | }; | ||
94 | |||
95 | struct kvm_dtable { | ||
96 | __u64 base; | ||
97 | __u16 limit; | ||
98 | __u16 padding[3]; | ||
99 | }; | ||
100 | |||
101 | |||
85 | #endif | 102 | #endif |
diff --git a/include/linux/kvm.h b/include/linux/kvm.h index 280ec0d85b4c..442cb58bb73c 100644 --- a/include/linux/kvm.h +++ b/include/linux/kvm.h | |||
@@ -151,21 +151,6 @@ struct kvm_fpu { | |||
151 | }; | 151 | }; |
152 | 152 | ||
153 | 153 | ||
154 | struct kvm_segment { | ||
155 | __u64 base; | ||
156 | __u32 limit; | ||
157 | __u16 selector; | ||
158 | __u8 type; | ||
159 | __u8 present, dpl, db, s, l, g, avl; | ||
160 | __u8 unusable; | ||
161 | __u8 padding; | ||
162 | }; | ||
163 | |||
164 | struct kvm_dtable { | ||
165 | __u64 base; | ||
166 | __u16 limit; | ||
167 | __u16 padding[3]; | ||
168 | }; | ||
169 | 154 | ||
170 | /* for KVM_GET_SREGS and KVM_SET_SREGS */ | 155 | /* for KVM_GET_SREGS and KVM_SET_SREGS */ |
171 | struct kvm_sregs { | 156 | struct kvm_sregs { |