From patchwork Thu Feb 18 15:19:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 584771 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 411371400A0 for ; Fri, 19 Feb 2016 02:20:05 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b=UzSFtq/y; dkim-atps=neutral Received: from localhost ([::1]:42399 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWQN9-0001aD-AB for incoming@patchwork.ozlabs.org; Thu, 18 Feb 2016 10:20:03 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44967) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWQMq-0001Dn-Ep for qemu-devel@nongnu.org; Thu, 18 Feb 2016 10:19:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aWQMp-0002LT-HM for qemu-devel@nongnu.org; Thu, 18 Feb 2016 10:19:44 -0500 Received: from mail-vk0-x230.google.com ([2607:f8b0:400c:c05::230]:35761) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWQMp-0002LM-Ab for qemu-devel@nongnu.org; Thu, 18 Feb 2016 10:19:43 -0500 Received: by mail-vk0-x230.google.com with SMTP id e6so47077228vkh.2 for ; Thu, 18 Feb 2016 07:19:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :content-type; bh=MYD8unZj3mJ/ECyMWRuX358YyZUd04lrNj9DU/5rJVQ=; b=UzSFtq/y+99D6gtWWEDXMj2MUqaBdjXbo4a+eISRBM8cgnIsbwtxe8uGigtZiBHtFo d/eADF8at2lYwhLR2X8yILv7Yg1mSFUpfgxA69tTpPc3d+5uXPMWeNG8li3OErXaMEO0 AcAr++aMJjvMyk4nR9a+m/ODscHO2Jp2Jr7Q4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:content-type; bh=MYD8unZj3mJ/ECyMWRuX358YyZUd04lrNj9DU/5rJVQ=; b=Y1fTpRd4fGas9wczXqnmWmyxP+TDn1SRrB1YNoaoil0gWT1zF+OQMn3s5FCSr46jZ9 mt3zp4ccFpgclFtSCBUIAZvZIIqGBFJrUHy3c9/0tv+o0+zaUapkOsNizC9nS38FmQTk tACKHe3VKryWr5u1bIAtNqfD0MD08toLBVpoOWSTJRWnUw6cgfTWDFNC66qPmfdHxnrk jFPwD+3Wdaw+8cUHrRf30F2/4O6jgZlbpSfYGLwDsyMNDkVAfjNoLA2OWXGOXLd/oFD1 DNZKhYGRUuk6J0xdxKpRK2vgbrvrm/+ab1eQzEQSDPdHM9iNbyzg8CsaIlxovtrdgnEZ USmw== X-Gm-Message-State: AG10YOQ3B8ge02KDQPatRT3ie4a7sU4MA3WwkSMgyqhcYGTKlWHLKGK4TUb6B/FRTm2Y9+Fw7GR9Y5IaXVAHobI7 X-Received: by 10.31.141.2 with SMTP id p2mr6684326vkd.37.1455808782784; Thu, 18 Feb 2016 07:19:42 -0800 (PST) MIME-Version: 1.0 Received: by 10.31.56.216 with HTTP; Thu, 18 Feb 2016 07:19:23 -0800 (PST) In-Reply-To: <1455806108-6961-1-git-send-email-peter.maydell@linaro.org> References: <1455806108-6961-1-git-send-email-peter.maydell@linaro.org> From: Peter Maydell Date: Thu, 18 Feb 2016 15:19:23 +0000 Message-ID: To: QEMU Developers X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400c:c05::230 Subject: Re: [Qemu-devel] [PULL 00/36] target-arm queue 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org On 18 February 2016 at 14:34, Peter Maydell wrote: > ARM pullreq with a whole pile of stuff; QOMification of SD cards > is perhaps the biggest individual thing here. > > thanks > -- PMM > > The following changes since commit 339b665c883b209982fa161dc090ffaf242ab12b: > > Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.6-20160218' into staging (2016-02-18 10:29:47 +0000) > > are available in the git repository at: > > > git://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20160218 Minor fixup needed for the w32 compiler that doesn't like duplicate typedefs, to the "hw/sd/pxa2xx_mmci: convert to SysBusDevice object" patch: New cover letter coming up shortly. -- PMM diff --git a/hw/sd/pxa2xx_mmci.c b/hw/sd/pxa2xx_mmci.c index cadbba3..e3753e5 100644 --- a/hw/sd/pxa2xx_mmci.c +++ b/hw/sd/pxa2xx_mmci.c @@ -21,7 +21,7 @@ #define TYPE_PXA2XX_MMCI "pxa2xx-mmci" #define PXA2XX_MMCI(obj) OBJECT_CHECK(PXA2xxMMCIState, (obj), TYPE_PXA2XX_MMCI) -typedef struct PXA2xxMMCIState { +struct PXA2xxMMCIState { SysBusDevice parent_obj; MemoryRegion iomem; @@ -57,7 +57,7 @@ typedef struct PXA2xxMMCIState { int resp_len; int cmdreq; -} PXA2xxMMCIState; +}; #define MMC_STRPCL 0x00 /* MMC Clock Start/Stop register */ #define MMC_STAT 0x04 /* MMC Status register */