aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJerone Young <jyoung5@us.ibm.com>2007-11-19 17:06:37 -0600
committerAvi Kivity <avi@qumranet.com>2008-01-30 17:53:08 +0200
commita162dd58736d446f52ca45b170508c3a5868807b (patch)
treedce2f29ccde737dba386d14986bfd77a9ec42456
parent244d57ece94b56692c61f2d507d1251b5844c550 (diff)
KVM: Portability: Move cpuid structures to <asm/kvm.h>
This patch moves structures: kvm_cpuid_entry kvm_cpuid 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.h17
-rw-r--r--include/linux/kvm.h16
2 files changed, 17 insertions, 16 deletions
diff --git a/include/asm-x86/kvm.h b/include/asm-x86/kvm.h
index 32c7dda6147..4837d759bec 100644
--- a/include/asm-x86/kvm.h
+++ b/include/asm-x86/kvm.h
@@ -135,4 +135,21 @@ struct kvm_msr_list {
};
+struct kvm_cpuid_entry {
+ __u32 function;
+ __u32 eax;
+ __u32 ebx;
+ __u32 ecx;
+ __u32 edx;
+ __u32 padding;
+};
+
+/* for KVM_SET_CPUID */
+struct kvm_cpuid {
+ __u32 nent;
+ __u32 padding;
+ struct kvm_cpuid_entry entries[0];
+};
+
+
#endif
diff --git a/include/linux/kvm.h b/include/linux/kvm.h
index e6867aa6daf..fd4f900fcce 100644
--- a/include/linux/kvm.h
+++ b/include/linux/kvm.h
@@ -192,22 +192,6 @@ struct kvm_dirty_log {
};
};
-struct kvm_cpuid_entry {
- __u32 function;
- __u32 eax;
- __u32 ebx;
- __u32 ecx;
- __u32 edx;
- __u32 padding;
-};
-
-/* for KVM_SET_CPUID */
-struct kvm_cpuid {
- __u32 nent;
- __u32 padding;
- struct kvm_cpuid_entry entries[0];
-};
-
/* for KVM_SET_SIGNAL_MASK */
struct kvm_signal_mask {
__u32 len;