From patchwork Sat Mar 28 04:53:05 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: nathan binkert X-Patchwork-Id: 14868 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n2S4rCDr011361 for ; Sat, 28 Mar 2009 04:53:12 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751780AbZC1ExK (ORCPT ); Sat, 28 Mar 2009 00:53:10 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751753AbZC1ExJ (ORCPT ); Sat, 28 Mar 2009 00:53:09 -0400 Received: from rv-out-0506.google.com ([209.85.198.234]:64563 "EHLO rv-out-0506.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751424AbZC1ExI (ORCPT ); Sat, 28 Mar 2009 00:53:08 -0400 Received: by rv-out-0506.google.com with SMTP id g37so280726rvb.5 for ; Fri, 27 Mar 2009 21:53:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:sender:received:date :x-google-sender-auth:message-id:subject:from:to:content-type :content-transfer-encoding; bh=lnWZCWfffzNTwJj3Un7+wcmQZW6SeHrZZWzkGBYx8ys=; b=IrLg+IBuKunV9nR632HDNq2CT273dYJ131tllY+t/JBy1ik7YiKGDaxNGTRN0MoyCu 9KQxQZX8f9sWF72Blt5130CPKKHy7zAqJNny1Sdy1YqL51tTHkBlJGMtyDA4usTi9UvW +l7ZWOZ8vE5Fftho18UfHNz8zoEeNoJU3F3A4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:date:x-google-sender-auth:message-id:subject :from:to:content-type:content-transfer-encoding; b=rpVwcKZvzfr1a7TqtaxxngDQmNRXMjHk0kh3IxL547dg+gfR9cWZ8CsLJi8Sln2X7I RBS3zOyjhZjxKJuOoOpNQN9gZ9zzPUFHwnLNMmDKn0xMS9hfDqvGecoY+WBAud/isbmP Ta8+5g43Xw/8QLFDTPUVNCqIr5wCebK+4M/X4= MIME-Version: 1.0 Received: by 10.114.57.1 with SMTP id f1mr1949031waa.145.1238215985428; Fri, 27 Mar 2009 21:53:05 -0700 (PDT) Date: Fri, 27 Mar 2009 21:53:05 -0700 X-Google-Sender-Auth: 1716059ed6fc3115 Message-ID: <217accd40903272153m650b0f1ata7bc899eb4b92be0@mail.gmail.com> Subject: [PATCH] KVM: Make kvm header compile under g++. From: nathan binkert To: kvm@vger.kernel.org Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.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 --- 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 ee755e2..2e3a734 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; }; };