浏览代码

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>
Jerone Young 17 年之前
父节点
当前提交
a162dd5873
共有 2 个文件被更改,包括 17 次插入16 次删除
  1. 17 0
      include/asm-x86/kvm.h
  2. 0 16
      include/linux/kvm.h

+ 17 - 0
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
 #endif

+ 0 - 16
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 */
 /* for KVM_SET_SIGNAL_MASK */
 struct kvm_signal_mask {
 struct kvm_signal_mask {
 	__u32 len;
 	__u32 len;