diff options
author | Jerone Young <jyoung5@us.ibm.com> | 2007-11-19 18:06:36 -0500 |
---|---|---|
committer | Avi Kivity <avi@qumranet.com> | 2008-01-30 10:53:08 -0500 |
commit | 244d57ece94b56692c61f2d507d1251b5844c550 (patch) | |
tree | 69db4777d504c4af95432a464fd82b3fb2f7f100 /include/linux/kvm.h | |
parent | 3a56b20104f51bd6caf07e49fa1e3c09bee222e5 (diff) |
KVM: Portability: Move kvm_sregs and msr structures to <asm/kvm.h>
Move structures:
kvm_sregs
kvm_msr_entry
kvm_msrs
kvm_msr_list
from include/linux/kvm.h to include/asm-x86/kvm.h
Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'include/linux/kvm.h')
-rw-r--r-- | include/linux/kvm.h | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/include/linux/kvm.h b/include/linux/kvm.h index 442cb58bb73c..e6867aa6daf6 100644 --- a/include/linux/kvm.h +++ b/include/linux/kvm.h | |||
@@ -13,9 +13,6 @@ | |||
13 | 13 | ||
14 | #define KVM_API_VERSION 12 | 14 | #define KVM_API_VERSION 12 |
15 | 15 | ||
16 | /* Architectural interrupt line count. */ | ||
17 | #define KVM_NR_INTERRUPTS 256 | ||
18 | |||
19 | /* for KVM_CREATE_MEMORY_REGION */ | 16 | /* for KVM_CREATE_MEMORY_REGION */ |
20 | struct kvm_memory_region { | 17 | struct kvm_memory_region { |
21 | __u32 slot; | 18 | __u32 slot; |
@@ -151,39 +148,6 @@ struct kvm_fpu { | |||
151 | }; | 148 | }; |
152 | 149 | ||
153 | 150 | ||
154 | |||
155 | /* for KVM_GET_SREGS and KVM_SET_SREGS */ | ||
156 | struct kvm_sregs { | ||
157 | /* out (KVM_GET_SREGS) / in (KVM_SET_SREGS) */ | ||
158 | struct kvm_segment cs, ds, es, fs, gs, ss; | ||
159 | struct kvm_segment tr, ldt; | ||
160 | struct kvm_dtable gdt, idt; | ||
161 | __u64 cr0, cr2, cr3, cr4, cr8; | ||
162 | __u64 efer; | ||
163 | __u64 apic_base; | ||
164 | __u64 interrupt_bitmap[(KVM_NR_INTERRUPTS + 63) / 64]; | ||
165 | }; | ||
166 | |||
167 | struct kvm_msr_entry { | ||
168 | __u32 index; | ||
169 | __u32 reserved; | ||
170 | __u64 data; | ||
171 | }; | ||
172 | |||
173 | /* for KVM_GET_MSRS and KVM_SET_MSRS */ | ||
174 | struct kvm_msrs { | ||
175 | __u32 nmsrs; /* number of msrs in entries */ | ||
176 | __u32 pad; | ||
177 | |||
178 | struct kvm_msr_entry entries[0]; | ||
179 | }; | ||
180 | |||
181 | /* for KVM_GET_MSR_INDEX_LIST */ | ||
182 | struct kvm_msr_list { | ||
183 | __u32 nmsrs; /* number of msrs in entries */ | ||
184 | __u32 indices[0]; | ||
185 | }; | ||
186 | |||
187 | /* for KVM_TRANSLATE */ | 151 | /* for KVM_TRANSLATE */ |
188 | struct kvm_translation { | 152 | struct kvm_translation { |
189 | /* in */ | 153 | /* in */ |