[PATCH] kvm: Fix mismatch between 32-bit and 64-bit abi

Unfortunately requiring a version bump.

Signed-off-by: Avi Kivity <avi@qumranet.com>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/include/linux/kvm.h b/include/linux/kvm.h
index 6a5f6f49e0371a6395c153bd3813b15f2859f038..f3604593fb76ded7fe359da2eea2e2ee640bd5b5 100644 (file)
--- a/include/linux/kvm.h
+++ b/include/linux/kvm.h
@@ -11,7 +11,7 @@
 #include <asm/types.h>
 #include <linux/ioctl.h>
 
-#define KVM_API_VERSION 2
+#define KVM_API_VERSION 3
 
 /*
  * Architectural interrupt line count, and the size of the bitmap needed
@@ -187,6 +187,7 @@ struct kvm_translation {
        __u8  valid;
        __u8  writeable;
        __u8  usermode;
+       __u8  pad[5];
 };
 
 /* for KVM_INTERRUPT */