lkml.org 
[lkml]   [2009]   [May]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 20/46] KVM: Make kvm header C++ friendly
    Date
    From: nathan binkert <nate@binkert.org>

    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>
    ---
    include/linux/kvm.h | 6 +++---
    1 files changed, 3 insertions(+), 3 deletions(-)

    diff --git a/include/linux/kvm.h b/include/linux/kvm.h
    index 644e3a9..3db5d8d 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;
    };
    };

    --
    1.6.0.6


    \
     
     \ /
      Last update: 2009-05-20 13:31    [W:0.022 / U:0.360 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site