From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1hVfCr-00031a-Dp for mharc-qemu-trivial@gnu.org; Tue, 28 May 2019 12:44:09 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57280) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hVfCo-0002xo-5c for qemu-trivial@nongnu.org; Tue, 28 May 2019 12:44:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hVfCl-0002Lu-La for qemu-trivial@nongnu.org; Tue, 28 May 2019 12:44:05 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55848) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hVfC4-0000rh-EZ; Tue, 28 May 2019 12:43:20 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1F5563179177; Tue, 28 May 2019 16:42:05 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.206.32]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3C49E60BDF; Tue, 28 May 2019 16:41:54 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, qemu-trivial@nongnu.org Cc: Dmitry Fleytman , "Michael S. Tsirkin" , Marcel Apfelbaum , Paolo Bonzini , Gerd Hoffmann , Aleksandar Rikalo , Halil Pasic , David Hildenbrand , Christian Borntraeger , Michael Walle , Richard Henderson , Aleksandar Markovic , Cornelia Huck , Alex Williamson , Peter Maydell , Fam Zheng , qemu-s390x@nongnu.org, Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Tue, 28 May 2019 18:40:15 +0200 Message-Id: <20190528164020.32250-6-philmd@redhat.com> In-Reply-To: <20190528164020.32250-1-philmd@redhat.com> References: <20190528164020.32250-1-philmd@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Tue, 28 May 2019 16:42:05 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-trivial] [PATCH v2 05/10] hw/sd: Use the QOM BUS() macro to access BusState.qbus X-BeenThere: qemu-trivial@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 May 2019 16:44:07 -0000 Rather than looking inside the definition of a BusState with "s->bus.qbus= ", use the QOM prefered style: "BUS(&s->bus)". This patch was generated using the following Coccinelle script: // Use BUS() macros to access BusState.qbus @use_bus_macro_to_access_qbus@ expression obj; identifier bus; @@ -&obj->bus.qbus +BUS(&obj->bus) Suggested-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/sd/milkymist-memcard.c | 2 +- hw/sd/ssi-sd.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/sd/milkymist-memcard.c b/hw/sd/milkymist-memcard.c index df42aa1c54..dd1ba649d9 100644 --- a/hw/sd/milkymist-memcard.c +++ b/hw/sd/milkymist-memcard.c @@ -277,7 +277,7 @@ static void milkymist_memcard_realize(DeviceState *de= v, Error **errp) /* 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; - carddev =3D qdev_create(&s->sdbus.qbus, TYPE_SD_CARD); + carddev =3D qdev_create(BUS(&s->sdbus), TYPE_SD_CARD); qdev_prop_set_drive(carddev, "drive", blk, &err); object_property_set_bool(OBJECT(carddev), true, "realized", &err); if (err) { diff --git a/hw/sd/ssi-sd.c b/hw/sd/ssi-sd.c index 623d0333e8..25e1009277 100644 --- a/hw/sd/ssi-sd.c +++ b/hw/sd/ssi-sd.c @@ -249,7 +249,7 @@ static void ssi_sd_realize(SSISlave *d, Error **errp) /* Create and plug in the sd card */ /* FIXME use a qdev drive property instead of drive_get_next() */ dinfo =3D drive_get_next(IF_SD); - carddev =3D qdev_create(&s->sdbus.qbus, TYPE_SD_CARD); + carddev =3D qdev_create(BUS(&s->sdbus), TYPE_SD_CARD); if (dinfo) { qdev_prop_set_drive(carddev, "drive", blk_by_legacy_dinfo(dinfo)= , &err); } --=20 2.20.1