Commit 2f8b9ee1 authored by nathan binkert's avatar nathan binkert Committed by Avi Kivity

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: default avatarNathan Binkert <nate@binkert.org>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent ede2ccc5
...@@ -119,7 +119,7 @@ struct kvm_run { ...@@ -119,7 +119,7 @@ struct kvm_run {
__u32 error_code; __u32 error_code;
} ex; } ex;
/* KVM_EXIT_IO */ /* KVM_EXIT_IO */
struct kvm_io { struct {
#define KVM_EXIT_IO_IN 0 #define KVM_EXIT_IO_IN 0
#define KVM_EXIT_IO_OUT 1 #define KVM_EXIT_IO_OUT 1
__u8 direction; __u8 direction;
...@@ -224,10 +224,10 @@ struct kvm_interrupt { ...@@ -224,10 +224,10 @@ struct kvm_interrupt {
/* for KVM_GET_DIRTY_LOG */ /* for KVM_GET_DIRTY_LOG */
struct kvm_dirty_log { struct kvm_dirty_log {
__u32 slot; __u32 slot;
__u32 padding; __u32 padding1;
union { union {
void __user *dirty_bitmap; /* one bit per page */ void __user *dirty_bitmap; /* one bit per page */
__u64 padding; __u64 padding2;
}; };
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment