---

yaml --- r: 146533 b: refs/heads/master c: 2f8b9ee h: refs/heads/master i: 146531: 867be40 v: v3
git-mirror · Jun 10, 2009 · ccd1f13 · ccd1f13
1 parent 502567f
commit ccd1f13
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ede2ccc51742059d356d419260460cbbf3e36273
+refs/heads/master: 2f8b9ee14eb439008e0c5131116ea6baa40dba50
diff --git a/trunk/include/linux/kvm.h b/trunk/include/linux/kvm.h
@@ -119,7 +119,7 @@ struct kvm_run {
 			__u32 error_code;
 		} ex;
 		/* KVM_EXIT_IO */
-		struct kvm_io {
+		struct {
 #define KVM_EXIT_IO_IN  0
 #define KVM_EXIT_IO_OUT 1
 			__u8 direction;
@@ -224,10 +224,10 @@ struct kvm_interrupt {
 /* for KVM_GET_DIRTY_LOG */
 struct kvm_dirty_log {
 	__u32 slot;
-	__u32 padding;
+	__u32 padding1;
 	union {
 		void __user *dirty_bitmap; /* one bit per page */
-		__u64 padding;
+		__u64 padding2;
 	};
 };