From patchwork Wed Jan 3 16:23:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 855082 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Gc77Cete"; dkim-atps=neutral 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 3zBbr271DGz9s81 for ; Thu, 4 Jan 2018 03:25:06 +1100 (AEDT) Received: from localhost ([::1]:57064 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWlqi-00046L-UV for incoming@patchwork.ozlabs.org; Wed, 03 Jan 2018 11:25:04 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44102) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWlpv-00043S-Ga for qemu-devel@nongnu.org; Wed, 03 Jan 2018 11:24:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWlpu-0004yn-Km for qemu-devel@nongnu.org; Wed, 03 Jan 2018 11:24:15 -0500 Received: from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]:39377) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWlpu-0004yS-Gr; Wed, 03 Jan 2018 11:24:14 -0500 Received: by mail-qt0-x242.google.com with SMTP id k19so2721390qtj.6; Wed, 03 Jan 2018 08:24:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ZAYXSXLOCdt3LidcgZriVmI+pUUqymgFJ7ci/yxcKeY=; b=Gc77CeteX2vHOr79D5er1GaQyLwHDiM1PQqzF/Bxtsa+m6/UtPQ+goX4VMKID0UBZY VlnJeF6/e8Xp5Vyp8naS9UeCREkGS5i2qe3huy4Luszc6xs2LQO/g58dj3u5WgpqByYJ 8PWJ2VQFLH8vrAQAGQU58h/Nk0mGtazr4BIyf73VfNzkUv7HO9Cn23ss1kKX1B89KVBk robvfWg8qMtrXFwmrKMkviBVh134gm6pSQhK5zhlqbU5gwRFwoYhoE1gf/tedgD0HIAE tYqJSB99xV34YTPy2bSCn3Lz1UbEwxCO2IafzeGxqSHfOLmnhG5z+Tmyd+KVsVRsf7De D5kg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=ZAYXSXLOCdt3LidcgZriVmI+pUUqymgFJ7ci/yxcKeY=; b=PIcZq7ycAWvy1IGBstDSofrVPs2iiCmupAszR6qooRSHUepmI96s6bF8kYr+eDXWGb 9LUE81d52cb4onT04VIlVfTNye+FyEs8q0lh2kXP5cT+Njdlfo5GWCIeQXdUQ9JN/7dZ /LScL8ZapWASByVcQGuHAFP8IFUjUcVY09MqQ5bKvNzk2fVhfN1gtw/EjjkErTaqyEiR L7oDIMeHRlKFJ2tTuoRJoRry4pOBjVhzi4SbdHYRneRRJWUCELS+zeJv3teLhj8oYq7t jJUTogDK3HkANBVCBCfTlPAAlFt9vY/xYh+c1wIlP4HtEStsO0ezsA74B+gUs8Oza92E 4+Eg== X-Gm-Message-State: AKGB3mIWWoTn89/cJnyf4mSfoJFyKrbPlFXRmSRev24lwY9eDurotQDx bs7W/H3+f2LvSURCZcSEAa0= X-Google-Smtp-Source: ACJfBosyDtuHieasb+5AhfWx80DSBoWl6zj7BdnSvhTXzHlOneD7a4WcSCMicMD3fGrSBednqVevyg== X-Received: by 10.237.59.202 with SMTP id s10mr2373806qte.294.1514996654016; Wed, 03 Jan 2018 08:24:14 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id 102sm839393qkx.85.2018.01.03.08.24.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jan 2018 08:24:13 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Alistair Francis , Peter Maydell , Michael Walle , Xiaoqiang Zhao Date: Wed, 3 Jan 2018 13:23:56 -0300 Message-Id: <20180103162400.10396-3-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180103162400.10396-1-f4bug@amsat.org> References: <20180103162400.10396-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::242 Subject: [Qemu-devel] [PATCH 2/6] hw/sd/milkymist-memcard: split realize() out of SysBusDevice init() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Edgar E . Iglesias" , qemu-arm@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Create the SDCard in the realize() function. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alistair Francis --- hw/sd/milkymist-memcard.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/hw/sd/milkymist-memcard.c b/hw/sd/milkymist-memcard.c index 5de3e00e2f..5df3a0f815 100644 --- a/hw/sd/milkymist-memcard.c +++ b/hw/sd/milkymist-memcard.c @@ -255,24 +255,29 @@ static void milkymist_memcard_reset(DeviceState *d) static int milkymist_memcard_init(SysBusDevice *dev) { MilkymistMemcardState *s = MILKYMIST_MEMCARD(dev); - DriveInfo *dinfo; + + memory_region_init_io(&s->regs_region, OBJECT(s), &memcard_mmio_ops, s, + "milkymist-memcard", R_MAX * 4); + sysbus_init_mmio(dev, &s->regs_region); + + return 0; +} + +static void milkymist_memcard_realize(DeviceState *dev, Error **errp) +{ + MilkymistMemcardState *s = MILKYMIST_MEMCARD(dev); BlockBackend *blk; + DriveInfo *dinfo; /* FIXME use a qdev drive property instead of drive_get_next() */ dinfo = drive_get_next(IF_SD); blk = dinfo ? blk_by_legacy_dinfo(dinfo) : NULL; s->card = sd_init(blk, false); if (s->card == NULL) { - return -1; + error_setg(errp, "failed to init SD card"); + return; } - s->enabled = blk && blk_is_inserted(blk); - - memory_region_init_io(&s->regs_region, OBJECT(s), &memcard_mmio_ops, s, - "milkymist-memcard", R_MAX * 4); - sysbus_init_mmio(dev, &s->regs_region); - - return 0; } static const VMStateDescription vmstate_milkymist_memcard = { @@ -298,6 +303,7 @@ static void milkymist_memcard_class_init(ObjectClass *klass, void *data) SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); k->init = milkymist_memcard_init; + dc->realize = milkymist_memcard_realize; dc->reset = milkymist_memcard_reset; dc->vmsd = &vmstate_milkymist_memcard; /* Reason: init() method uses drive_get_next() */