---

yaml --- r: 80757 b: refs/heads/master c: a162dd5 h: refs/heads/master i: 80755: 0317525 v: v3
git-mirror · Jan 30, 2008 · c223f84 · c223f84
1 parent a486ebc
commit c223f84
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 17 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 244d57ece94b56692c61f2d507d1251b5844c550
+refs/heads/master: a162dd58736d446f52ca45b170508c3a5868807b
diff --git a/trunk/include/asm-x86/kvm.h b/trunk/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/trunk/include/linux/kvm.h b/trunk/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;