From patchwork Thu Apr 17 20:40:40 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 28594 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f72.google.com (mail-qa0-f72.google.com [209.85.216.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id EDAE02188F for ; Thu, 17 Apr 2014 20:41:39 +0000 (UTC) Received: by mail-qa0-f72.google.com with SMTP id hw13sf2544492qab.11 for ; Thu, 17 Apr 2014 13:41:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:mime-version:in-reply-to:references :from:date:message-id:to:subject:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:errors-to:sender :x-original-sender:x-original-authentication-results:mailing-list :content-type; bh=ot/oGKvnBi4K6prsH407gIsLFUUj9sN2RuNbpqMTVIY=; b=NVSQkf87iK/HBbEGJjqNoaf2056x3zjXMBIb5A8io3gTk5F9VImTcNAbVI6nXXVhCK 0o/QDJJh2O/LYAwRDZs/G6kTivzz6qityMR0btm4dzF9Rty5ogKV7kcbEqRXEfZIlt/1 ViHGd98jMmUw+T2qW6S/yK8CSyZ+bBUkN2/wpQrt56anPgTTOdZznrdQQ2DYZBisjcLd EblqV5mizfocPEtJ9ySAfcHR0k0PMC3ldSYZgcWe57emkaYHIBzoOOmmUssjvNynch0V Fwvu7+FjZOMxSchzGY+DvUz5EMa5Xh+hTxWOeFGM0JcvSvSQWcST9Q15mCww09ZEnc/N Wgrw== X-Gm-Message-State: ALoCoQlWShsnsboUvLrynMqAX72XLxljwXw5A/RkLdSu+t4+xU0pbTG6cZ76D8p+H/xRRz0VDZq8 X-Received: by 10.58.178.137 with SMTP id cy9mr9215495vec.34.1397767299638; Thu, 17 Apr 2014 13:41:39 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.38.177 with SMTP id t46ls1253874qgt.16.gmail; Thu, 17 Apr 2014 13:41:39 -0700 (PDT) X-Received: by 10.52.15.132 with SMTP id x4mr7590099vdc.31.1397767299536; Thu, 17 Apr 2014 13:41:39 -0700 (PDT) Received: from mail-ve0-f181.google.com (mail-ve0-f181.google.com [209.85.128.181]) by mx.google.com with ESMTPS id sn5si4631305vdc.101.2014.04.17.13.41.39 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 17 Apr 2014 13:41:39 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.181 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.181; Received: by mail-ve0-f181.google.com with SMTP id oy12so1210921veb.40 for ; Thu, 17 Apr 2014 13:41:39 -0700 (PDT) X-Received: by 10.52.166.102 with SMTP id zf6mr8532683vdb.2.1397767299466; Thu, 17 Apr 2014 13:41:39 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp64189vcb; Thu, 17 Apr 2014 13:41:39 -0700 (PDT) X-Received: by 10.224.161.10 with SMTP id p10mr16013960qax.12.1397767298673; Thu, 17 Apr 2014 13:41:38 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id k3si2293169qge.82.2014.04.17.13.41.38 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 17 Apr 2014 13:41:38 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:35014 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wat7q-0000iQ-8l for patch@linaro.org; Thu, 17 Apr 2014 16:41:38 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40017) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wat7L-0000M4-6W for qemu-devel@nongnu.org; Thu, 17 Apr 2014 16:41:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wat7G-0007BF-CD for qemu-devel@nongnu.org; Thu, 17 Apr 2014 16:41:07 -0400 Received: from mail-lb0-f182.google.com ([209.85.217.182]:52436) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wat7G-0007B8-4k for qemu-devel@nongnu.org; Thu, 17 Apr 2014 16:41:02 -0400 Received: by mail-lb0-f182.google.com with SMTP id n15so782079lbi.41 for ; Thu, 17 Apr 2014 13:41:01 -0700 (PDT) X-Received: by 10.152.42.196 with SMTP id q4mr11170654lal.14.1397767261068; Thu, 17 Apr 2014 13:41:01 -0700 (PDT) MIME-Version: 1.0 Received: by 10.112.180.233 with HTTP; Thu, 17 Apr 2014 13:40:40 -0700 (PDT) In-Reply-To: <1397730846-7576-42-git-send-email-peter.maydell@linaro.org> References: <1397730846-7576-1-git-send-email-peter.maydell@linaro.org> <1397730846-7576-42-git-send-email-peter.maydell@linaro.org> From: Peter Maydell Date: Thu, 17 Apr 2014 21:40:40 +0100 Message-ID: To: QEMU Developers , Beniamino Galvani X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.217.182 Subject: Re: [Qemu-devel] [PULL 41/51] allwinner-a10-pit: avoid generation of spurious interrupts X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.181 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 On 17 April 2014 11:33, Peter Maydell wrote: > From: Beniamino Galvani > diff --git a/include/hw/timer/allwinner-a10-pit.h b/include/hw/timer/allwinner-a10-pit.h > index 15efab8..a48d3c7 100644 > --- a/include/hw/timer/allwinner-a10-pit.h > +++ b/include/hw/timer/allwinner-a10-pit.h > @@ -35,12 +35,20 @@ > > #define AW_A10_PIT_DEFAULT_CLOCK 0x4 > > +typedef struct AwA10PITState AwA10PITState; > + > +typedef struct AwA10TimerContext { > + AwA10PITState *container; > + int index; > +} AwA10TimerContext; > + > typedef struct AwA10PITState { > /*< private >*/ > SysBusDevice parent_obj; > /*< public >*/ > qemu_irq irq[AW_A10_PIT_TIMER_NR]; > ptimer_state * timer[AW_A10_PIT_TIMER_NR]; > + AwA10TimerContext timer_context[AW_A10_PIT_TIMER_NR]; > MemoryRegion iomem; > > uint32_t irq_enable; > -- This turns out to not compile on the mingw32 compiler (perhaps just because it's a newer gcc?) -- it's pickier about the fact we've defined this typedef twice. I've applied the following fixup to the patch and regenerated the pull request: cam-vm-266:precise:qemu$ git diff (not resending in the interests of avoiding spamming the list with 50 patches again...) thanks -- PMM diff --git a/include/hw/timer/allwinner-a10-pit.h b/include/hw/timer/allwinner-a10-pit.h index a48d3c7..2158fc0 100644 --- a/include/hw/timer/allwinner-a10-pit.h +++ b/include/hw/timer/allwinner-a10-pit.h @@ -42,7 +42,7 @@ typedef struct AwA10TimerContext { int index; } AwA10TimerContext; -typedef struct AwA10PITState { +struct AwA10PITState { /*< private >*/ SysBusDevice parent_obj; /*< public >*/ @@ -61,6 +61,6 @@ typedef struct AwA10PITState { uint32_t count_lo; uint32_t count_hi; uint32_t count_ctl; -} AwA10PITState; +}; #endif