From nobody Tue Feb 10 16:22:10 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1516680027950758.4147864183453; Mon, 22 Jan 2018 20:00:27 -0800 (PST) Received: from localhost ([::1]:60975 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edpl5-00076e-86 for importer@patchew.org; Mon, 22 Jan 2018 23:00:27 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44279) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edpjX-00063w-1a for qemu-devel@nongnu.org; Mon, 22 Jan 2018 22:58:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1edpjW-0002I8-2j for qemu-devel@nongnu.org; Mon, 22 Jan 2018 22:58:51 -0500 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:37147) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1edpjV-0002H8-UF for qemu-devel@nongnu.org; Mon, 22 Jan 2018 22:58:50 -0500 Received: by mail-qt0-x243.google.com with SMTP id d54so26602006qtd.4 for ; Mon, 22 Jan 2018 19:58:49 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id n24sm12447530qta.26.2018.01.22.19.58.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Jan 2018 19:58:48 -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=iWOsXsMNNZ11QjuBCGp30g6CoK//jNrbVMhJCzjG/TM=; b=rVJJak8pEc1qJgMPCP7FFBxoz1DxuYpTsJyqjT4jyBV0S9q4NAKIeViJs66sKFXmpD fniMNWiW/NI3OLbNOh/yBw5icwFKDSfI6rqZqDODj42G0/2aArlBWHH19xXoTluhop0E BDj3+tgoKsPBx68IWm9SrNUsFITTFOsYoOEhy285RgW6vHbfjtfeN9IHlh8FTSCA/IA4 dgq9TRlzv8zq8rFMCplFE6WPA/yqb1yUhx7UYk0zLq0FFvQOThjBDkdxzRYJXm+9a/xi UGnTf03R0OH3b4bBZWE+BbiiaF8m0fO6+xXHlYxmUuPk23ELgCKoa/2yzyZJaLQXOFJO B4rw== 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=iWOsXsMNNZ11QjuBCGp30g6CoK//jNrbVMhJCzjG/TM=; b=jMenMwcXQfUYBTnyzrfLBueydcJd+JqTkojuUYjIrX+jogwsrvuB8n8QrGPlEAhbEV 7uiBp2RwNohbkwtUgfnkWzTE+KDfxsBorBTPYBfkwEDmjcXHKtisANw0IZ0z9bEPAngA KUXqDB/NWbxtzbKOyZNOsP7SJwfJAiBd878Heo8f6fzch1Z5+rgiGqi23fNnU+F9gMqj ZBUMbC1IC6uShznrrn2MxiYxxZECgwa44+ntJ1Px32Ir9p3kqy6bQLaXl81jj7DVOiRI yzZE+M2UQqRwYf7yOHAhVmMNACQTI9vFb805f4hXgdyEy5RsCLAuIKpsX2vrT+2ruHO/ Mljg== X-Gm-Message-State: AKwxytclZqr94j8596Hg4WVmFGxe3JFjPzg6E4g3xwGRe70QxIEOb5EE TMPXB3VwwjBcrN/tcsFJenE= X-Google-Smtp-Source: AH8x2271+eD9CTkVTbLUwvk0me4/mSdbpMyjbWcyBolt6aW7e0RYM/VCC+QLQqpoOS043df20szOaw== X-Received: by 10.200.57.75 with SMTP id t11mr1661961qtb.325.1516679929347; Mon, 22 Jan 2018 19:58:49 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , Peter Maydell , Michael Walle Date: Tue, 23 Jan 2018 00:58:33 -0300 Message-Id: <20180123035837.16578-3-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180123035837.16578-1-f4bug@amsat.org> References: <20180123035837.16578-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::243 Subject: [Qemu-devel] [PATCH v2 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" , Stefan Weil , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Create the SDCard in the realize() function. Suggested-by: Michael Walle Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Michael Walle Reviewed-by: Alistair Francis --- hw/sd/milkymist-memcard.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/hw/sd/milkymist-memcard.c b/hw/sd/milkymist-memcard.c index 1292c0c099..a8e65892c7 100644 --- a/hw/sd/milkymist-memcard.c +++ b/hw/sd/milkymist-memcard.c @@ -257,27 +257,31 @@ static void milkymist_memcard_reset(DeviceState *d) device_reset(DEVICE(s->card)); } =20 -static int milkymist_memcard_init(SysBusDevice *dev) +static void milkymist_memcard_init(Object *obj) +{ + MilkymistMemcardState *s =3D MILKYMIST_MEMCARD(obj); + SysBusDevice *dev =3D SYS_BUS_DEVICE(obj); + + 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); +} + +static void milkymist_memcard_realize(DeviceState *dev, Error **errp) { MilkymistMemcardState *s =3D MILKYMIST_MEMCARD(dev); - DriveInfo *dinfo; BlockBackend *blk; + DriveInfo *dinfo; =20 /* FIXME use a qdev drive property instead of drive_get_next() */ dinfo =3D drive_get_next(IF_SD); blk =3D dinfo ? blk_by_legacy_dinfo(dinfo) : NULL; s->card =3D sd_init(blk, false); if (s->card =3D=3D NULL) { - return -1; + error_setg(errp, "failed to init SD card"); + return; } - s->enabled =3D 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; } =20 static const VMStateDescription vmstate_milkymist_memcard =3D { @@ -300,9 +304,8 @@ static const VMStateDescription vmstate_milkymist_memca= rd =3D { static void milkymist_memcard_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); - SysBusDeviceClass *k =3D SYS_BUS_DEVICE_CLASS(klass); =20 - k->init =3D milkymist_memcard_init; + dc->realize =3D milkymist_memcard_realize; dc->reset =3D milkymist_memcard_reset; dc->vmsd =3D &vmstate_milkymist_memcard; /* Reason: init() method uses drive_get_next() */ @@ -313,6 +316,7 @@ static const TypeInfo milkymist_memcard_info =3D { .name =3D TYPE_MILKYMIST_MEMCARD, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(MilkymistMemcardState), + .instance_init =3D milkymist_memcard_init, .class_init =3D milkymist_memcard_class_init, }; =20 --=20 2.15.1