From nobody Fri Oct 24 20:22:34 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of _spf.google.com designates 209.85.213.66 as permitted sender) client-ip=209.85.213.66; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-vk0-f66.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of _spf.google.com designates 209.85.213.66 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-vk0-f66.google.com (mail-vk0-f66.google.com [209.85.213.66]) by mx.zohomail.com with SMTPS id 15187481980097.869011747220725; Thu, 15 Feb 2018 18:29:58 -0800 (PST) Received: by mail-vk0-f66.google.com with SMTP id w201so1067345vkw.0 for ; Thu, 15 Feb 2018 18:29:57 -0800 (PST) Return-Path: Return-Path: Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id q5sm6295200uaj.17.2018.02.15.18.29.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Feb 2018 18:29:56 -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=zAU7OHE0p1sVLM81A5CNlqLm9SyQCG2KgSyQZo9ce4Q=; b=SUuMkhWI4KST94MuAq1FWOs1Slpw9ffGOO3YOpNcB5ZwLLU2DjQ+Ly7oAKUcA5DAiM LaxH06t5fL2tmnVikI58FC1wgDsX1JtY7pIJkg9m3c5GGGGB177VnND8rfolSsGY2X0v H/u6jYrAJHgtwfzACX4LZP51nuuBRzKq9IpPUKQxNLIb8F70jlzyEszYzkEme9iULP9w VcgSQivONN5WFLNlRobHt0J8DsfpNJjoJtFjzqzJyG1/QzX6m9okz4rB88hyQY7wlsvO vsqEvFuanIpgl8H8/VNmRr/HrL1voZN+yk9tuuPki63UXSmxovJq6R+0otrmF+tr0Pbo oDQQ== 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=zAU7OHE0p1sVLM81A5CNlqLm9SyQCG2KgSyQZo9ce4Q=; b=om5RtegJYeaghbbnSg7FhdFlR2oL969tZ8PaOxA51EJSnEO1xq7z8mpfmPj6Qbor+z dm0EcfDM6HlHsjduib7B0EBOLRcOu3H6MFcamJFcSFLw8cAc4rE8ytauZdiUVjV0U9tf +0P4B4FaAHYB9haA7AL5KVZMdjxwP1nAteLTfjSS/v49V/SmLy3kKZyoAvXuhhhVew1n w51PdfGDMrblh8BdTt9nMGYRWtghUhFFxmQ9GInRd1PgClJUCSdhUXbHPkcLGRSZXY7N TUQXP6vM9waIpZGYo6bnjDpW9Xf9ZCtqw5jq4BzltrckyrhJupWImgVXWDM3YqPL9xfx rcSw== X-Gm-Message-State: APf1xPA08JwAOsdHUs5fIC8n1x83QWXhZZmZRWDN0j/Jk0UDVAg2GjdU hyCjmmwpUbUwDgNwllwygcs= X-Google-Smtp-Source: AH8x227fwaEJl9wG2ef4sUU43goirpDfw2b83fNVdsehYdGjXkkdQ++/rQ6wtNkToikwlAa14mqNMQ== X-Received: by 10.31.236.195 with SMTP id k186mr3623994vkh.166.1518748197056; Thu, 15 Feb 2018 18:29:57 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , Peter Maydell Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, "Edgar E . Iglesias" , Andrzej Zaborowski , Michael Walle , Stefan Weil Subject: [PATCH v3 2/7] hw/sd/milkymist-memcard: split realize() out of SysBusDevice init() Date: Thu, 15 Feb 2018 23:29:27 -0300 Message-Id: <20180216022933.10945-3-f4bug@amsat.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180216022933.10945-1-f4bug@amsat.org> References: <20180216022933.10945-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZohoMail: RDKM_0 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 Reviewed-by: Alistair Francis Acked-by: Michael Walle --- 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.16.1