aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authornathan binkert <nate@binkert.org>2009-03-27 21:53:05 -0700
committerAvi Kivity <avi@redhat.com>2009-06-10 11:48:39 +0300
commit2f8b9ee14eb439008e0c5131116ea6baa40dba50 (patch)
tree7c269a25ba379aef925c8cc462232c116f297a37 /include
parentede2ccc51742059d356d419260460cbbf3e36273 (diff)
KVM: Make kvm header C++ friendly
Two things needed fixing: 1) g++ does not allow a named structure type within an anonymous union and 2) Avoid name clash between two padding fields within the same struct by giving them different names as is done elsewhere in the header. Signed-off-by: Nathan Binkert <nate@binkert.org> Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/kvm.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/kvm.h b/include/linux/kvm.h
index 644e3a9f47d..3db5d8d3748 100644
--- a/include/linux/kvm.h
+++ b/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;
};
};