From patchwork Mon Mar 23 14:55:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 453493 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 E81D514017B for ; Tue, 24 Mar 2015 01:58:31 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=gmail.com header.i=@gmail.com header.b=zlrDxpV/; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: from localhost ([::1]:56433 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ya3oE-0003TJ-8C for incoming@patchwork.ozlabs.org; Mon, 23 Mar 2015 10:58:30 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44827) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ya3lk-0007lj-L7 for qemu-devel@nongnu.org; Mon, 23 Mar 2015 10:55:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ya3lb-0005lm-Ji for qemu-devel@nongnu.org; Mon, 23 Mar 2015 10:55:56 -0400 Received: from mail-we0-x231.google.com ([2a00:1450:400c:c03::231]:33360) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ya3la-0005lc-Sj for qemu-devel@nongnu.org; Mon, 23 Mar 2015 10:55:47 -0400 Received: by weop45 with SMTP id p45so140010045weo.0 for ; Mon, 23 Mar 2015 07:55:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=EAKPNVqaUcLSxT5z3zCtrAuLJhWURLh9BONBuXRRNMQ=; b=zlrDxpV/WbJygJ5jidSUrvuiOts53WCsXWQgdVqJSMLa80qNsqt4scl6BgjQy+prDq vO0rvt8ols4KaDKpGo6XakD+RnCawZxGbldvAfnvZTRkNPj38LVQbg5jzXxOkyHqAlJD vvYNT4JWsEmu0vU8c5vIqj0iP/V1fiRMRMBY8mHyCAK6av4iw36fXuq81ojoGf9lyHer Rg50GWDNNbi0p8OtueAjrkhXsBxpjkFE4lnCHBYRQEl96SD1Gw+11mAls0Zq6RCniNDl v1KtoBhxjLRTwk0cFXqAjlQfNlHUnVzd8YGoUcnMk/A/raX3akxQ1WKPHPcV0qI1FmC4 dntg== X-Received: by 10.194.223.5 with SMTP id qq5mr189879811wjc.152.1427122546166; Mon, 23 Mar 2015 07:55:46 -0700 (PDT) Received: from donizetti.redhat.com (net-93-66-123-41.cust.vodafonedsl.it. [93.66.123.41]) by mx.google.com with ESMTPSA id v8sm11575115wib.0.2015.03.23.07.55.43 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Mar 2015 07:55:45 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 23 Mar 2015 15:55:37 +0100 Message-Id: <1427122538-26060-2-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 2.3.3 In-Reply-To: <1427122538-26060-1-git-send-email-pbonzini@redhat.com> References: <1427122538-26060-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c03::231 Cc: edgar.iglesias@gmail.com, peter.crosthwaite@xilinx.com, michael@walle.cc, armbru@redhat.com, peter.maydell@linaro.org Subject: [Qemu-devel] [PATCH for-2.3 v2 1/2] sd: move blk_attach_dev_nofail to caller 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 blk_attach_dev might not be necessary for devices that use a drive-type property. It is not appropriate to make the call unconditional in sd_init. Signed-off-by: Paolo Bonzini --- hw/sd/milkymist-memcard.c | 3 +++ hw/sd/omap_mmc.c | 4 ++++ hw/sd/pl181.c | 7 ++++++- hw/sd/pxa2xx_mmci.c | 4 ++++ hw/sd/sd.c | 1 - hw/sd/sdhci.c | 7 ++++++- hw/sd/ssi-sd.c | 7 ++++++- 7 files changed, 29 insertions(+), 4 deletions(-) diff --git a/hw/sd/milkymist-memcard.c b/hw/sd/milkymist-memcard.c index 9661eaf..dc81b9b 100644 --- a/hw/sd/milkymist-memcard.c +++ b/hw/sd/milkymist-memcard.c @@ -257,6 +257,9 @@ static int milkymist_memcard_init(SysBusDevice *dev) dinfo = drive_get_next(IF_SD); blk = dinfo ? blk_by_legacy_dinfo(dinfo) : NULL; + if (blk) { + blk_attach_dev_nofail(blk, s); + } s->card = sd_init(blk, false); if (s->card == NULL) { return -1; diff --git a/hw/sd/omap_mmc.c b/hw/sd/omap_mmc.c index d072dec..f169cb1 100644 --- a/hw/sd/omap_mmc.c +++ b/hw/sd/omap_mmc.c @@ -19,6 +19,7 @@ #include "hw/hw.h" #include "hw/arm/omap.h" #include "hw/sd.h" +#include "sysemu/block-backend.h" struct omap_mmc_s { qemu_irq irq; @@ -621,6 +622,9 @@ struct omap_mmc_s *omap2_mmc_init(struct omap_target_agent_s *ta, omap_l4_attach(ta, 0, &s->iomem); /* Instantiate the storage */ + if (blk) { + blk_attach_dev_nofail(blk, s); + } s->card = sd_init(blk, false); if (s->card == NULL) { exit(1); diff --git a/hw/sd/pl181.c b/hw/sd/pl181.c index e704b6e..1b7a72f 100644 --- a/hw/sd/pl181.c +++ b/hw/sd/pl181.c @@ -484,6 +484,7 @@ static int pl181_init(SysBusDevice *sbd) DeviceState *dev = DEVICE(sbd); PL181State *s = PL181(dev); DriveInfo *dinfo; + BlockBackend *blk; memory_region_init_io(&s->iomem, OBJECT(s), &pl181_ops, s, "pl181", 0x1000); sysbus_init_mmio(sbd, &s->iomem); @@ -491,7 +492,11 @@ static int pl181_init(SysBusDevice *sbd) sysbus_init_irq(sbd, &s->irq[1]); qdev_init_gpio_out(dev, s->cardstatus, 2); dinfo = drive_get_next(IF_SD); - s->card = sd_init(dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, false); + blk = dinfo ? blk_by_legacy_dinfo(dinfo) : NULL; + if (blk) { + blk_attach_dev_nofail(blk, s); + } + s->card = sd_init(blk, false); if (s->card == NULL) { return -1; } diff --git a/hw/sd/pxa2xx_mmci.c b/hw/sd/pxa2xx_mmci.c index ac3ab39..0366414 100644 --- a/hw/sd/pxa2xx_mmci.c +++ b/hw/sd/pxa2xx_mmci.c @@ -14,6 +14,7 @@ #include "hw/arm/pxa.h" #include "hw/sd.h" #include "hw/qdev.h" +#include "sysemu/block-backend.h" struct PXA2xxMMCIState { MemoryRegion iomem; @@ -538,6 +539,9 @@ PXA2xxMMCIState *pxa2xx_mmci_init(MemoryRegion *sysmem, memory_region_add_subregion(sysmem, base, &s->iomem); /* Instantiate the actual storage */ + if (blk) { + blk_attach_dev_nofail(blk, s); + } s->card = sd_init(blk, false); if (s->card == NULL) { exit(1); diff --git a/hw/sd/sd.c b/hw/sd/sd.c index f955265..794969b 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -494,7 +494,6 @@ SDState *sd_init(BlockBackend *blk, bool is_spi) sd->enable = true; sd_reset(sd, blk); if (sd->blk) { - blk_attach_dev_nofail(sd->blk, sd); blk_set_dev_ops(sd->blk, &sd_block_ops, sd); } vmstate_register(NULL, -1, &sd_vmstate, sd); diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 27b914a..ed60674 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1145,9 +1145,14 @@ static inline unsigned int sdhci_get_fifolen(SDHCIState *s) static void sdhci_initfn(SDHCIState *s) { DriveInfo *di; + BlockBackend *blk; di = drive_get_next(IF_SD); - s->card = sd_init(di ? blk_by_legacy_dinfo(di) : NULL, false); + blk = di ? blk_by_legacy_dinfo(di) : NULL; + if (blk) { + blk_attach_dev_nofail(blk, s); + } + s->card = sd_init(blk, false); if (s->card == NULL) { exit(1); } diff --git a/hw/sd/ssi-sd.c b/hw/sd/ssi-sd.c index a71fbca..488b615 100644 --- a/hw/sd/ssi-sd.c +++ b/hw/sd/ssi-sd.c @@ -253,10 +253,15 @@ static int ssi_sd_init(SSISlave *d) DeviceState *dev = DEVICE(d); ssi_sd_state *s = FROM_SSI_SLAVE(ssi_sd_state, d); DriveInfo *dinfo; + BlockBackend *blk; s->mode = SSI_SD_CMD; dinfo = drive_get_next(IF_SD); - s->sd = sd_init(dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, true); + blk = dinfo ? blk_by_legacy_dinfo(dinfo) : NULL; + if (blk) { + blk_attach_dev_nofail(blk, s); + } + s->sd = sd_init(blk, true); if (s->sd == NULL) { return -1; }