diff options
-rw-r--r-- | include/asm-x86/kvm.h | 36 | ||||
-rw-r--r-- | include/linux/kvm.h | 36 |
2 files changed, 36 insertions, 36 deletions
diff --git a/include/asm-x86/kvm.h b/include/asm-x86/kvm.h index 644a325077f0..32c7dda61474 100644 --- a/include/asm-x86/kvm.h +++ b/include/asm-x86/kvm.h | |||
@@ -9,6 +9,9 @@ | |||
9 | #include <asm/types.h> | 9 | #include <asm/types.h> |
10 | #include <linux/ioctl.h> | 10 | #include <linux/ioctl.h> |
11 | 11 | ||
12 | /* Architectural interrupt line count. */ | ||
13 | #define KVM_NR_INTERRUPTS 256 | ||
14 | |||
12 | struct kvm_memory_alias { | 15 | struct kvm_memory_alias { |
13 | __u32 slot; /* this has a different namespace than memory slots */ | 16 | __u32 slot; /* this has a different namespace than memory slots */ |
14 | __u32 flags; | 17 | __u32 flags; |
@@ -99,4 +102,37 @@ struct kvm_dtable { | |||
99 | }; | 102 | }; |
100 | 103 | ||
101 | 104 | ||
105 | /* for KVM_GET_SREGS and KVM_SET_SREGS */ | ||
106 | struct kvm_sregs { | ||
107 | /* out (KVM_GET_SREGS) / in (KVM_SET_SREGS) */ | ||
108 | struct kvm_segment cs, ds, es, fs, gs, ss; | ||
109 | struct kvm_segment tr, ldt; | ||
110 | struct kvm_dtable gdt, idt; | ||
111 | __u64 cr0, cr2, cr3, cr4, cr8; | ||
112 | __u64 efer; | ||
113 | __u64 apic_base; | ||
114 | __u64 interrupt_bitmap[(KVM_NR_INTERRUPTS + 63) / 64]; | ||
115 | }; | ||
116 | |||
117 | struct kvm_msr_entry { | ||
118 | __u32 index; | ||
119 | __u32 reserved; | ||
120 | __u64 data; | ||
121 | }; | ||
122 | |||
123 | /* for KVM_GET_MSRS and KVM_SET_MSRS */ | ||
124 | struct kvm_msrs { | ||
125 | __u32 nmsrs; /* number of msrs in entries */ | ||
126 | __u32 pad; | ||
127 | |||
128 | struct kvm_msr_entry entries[0]; | ||
129 | }; | ||
130 | |||
131 | /* for KVM_GET_MSR_INDEX_LIST */ | ||
132 | struct kvm_msr_list { | ||
133 | __u32 nmsrs; /* number of msrs in entries */ | ||
134 | __u32 indices[0]; | ||
135 | }; | ||
136 | |||
137 | |||
102 | #endif | 138 | #endif |
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 */ |