From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org, Eduardo Habkost <eduardo@habkost.net>
Cc: qemu-block@nongnu.org, "Hu Tao" <hutao@cn.fujitsu.com>,
"Gonglei Arei" <arei.gonglei@huawei.com>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Li Qiang" <liq3ea@163.com>, "Thomas Huth" <thuth@redhat.com>,
"Cao jin" <caoj.fnst@cn.fujitsu.com>,
"xiaoqiang zhao" <zxq_yx_007@163.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"John Snow" <jsnow@redhat.com>
Subject: [PATCH v3 07/14] hw/ide/qdev: Replace DO_UPCAST(IDEBus) by IDE_BUS()
Date: Mon, 13 Feb 2023 19:43:31 +0100 [thread overview]
Message-ID: <20230213184338.46712-8-philmd@linaro.org> (raw)
In-Reply-To: <20230213184338.46712-1-philmd@linaro.org>
Use the IDE_BUS() QOM type-checking macro to avoid DO_UPCAST().
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/ide/qdev.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c
index 1ead62fd18..a168643266 100644
--- a/hw/ide/qdev.c
+++ b/hw/ide/qdev.c
@@ -90,7 +90,7 @@ static void ide_qdev_realize(DeviceState *qdev, Error **errp)
{
IDEDevice *dev = IDE_DEVICE(qdev);
IDEDeviceClass *dc = IDE_DEVICE_GET_CLASS(dev);
- IDEBus *bus = DO_UPCAST(IDEBus, qbus, qdev_get_parent_bus(qdev));
+ IDEBus *bus = IDE_BUS(qdev_get_parent_bus(qdev));
if (dev->unit == -1) {
dev->unit = bus->master ? 1 : 0;
@@ -139,7 +139,7 @@ IDEDevice *ide_create_drive(IDEBus *bus, int unit, DriveInfo *drive)
int ide_get_geometry(BusState *bus, int unit,
int16_t *cyls, int8_t *heads, int8_t *secs)
{
- IDEState *s = &DO_UPCAST(IDEBus, qbus, bus)->ifs[unit];
+ IDEState *s = &IDE_BUS(bus)->ifs[unit];
if (s->drive_kind != IDE_HD || !s->blk) {
return -1;
@@ -153,7 +153,7 @@ int ide_get_geometry(BusState *bus, int unit,
int ide_get_bios_chs_trans(BusState *bus, int unit)
{
- return DO_UPCAST(IDEBus, qbus, bus)->ifs[unit].chs_trans;
+ return IDE_BUS(bus)->ifs[unit].chs_trans;
}
/* --------------------------------- */
@@ -164,7 +164,7 @@ typedef struct IDEDrive {
static void ide_dev_initfn(IDEDevice *dev, IDEDriveKind kind, Error **errp)
{
- IDEBus *bus = DO_UPCAST(IDEBus, qbus, qdev_get_parent_bus(DEVICE(dev)));
+ IDEBus *bus = IDE_BUS(qdev_get_parent_bus(DEVICE(dev)));
IDEState *s = bus->ifs + dev->unit;
int ret;
--
2.38.1
next prev parent reply other threads:[~2023-02-13 18:47 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-13 18:43 [PATCH v3 00/14] hw: Use QOM macros and remove DO_UPCAST() uses Philippe Mathieu-Daudé
2023-02-13 18:43 ` [PATCH v3 01/14] hw/char/serial-pci: Replace DO_UPCAST(PCISerialState) by PCI_SERIAL() Philippe Mathieu-Daudé
2023-02-16 11:20 ` Thomas Huth
2023-02-16 13:00 ` Philippe Mathieu-Daudé
2023-02-16 14:17 ` BALATON Zoltan
2023-02-16 15:22 ` Philippe Mathieu-Daudé
2023-02-13 18:43 ` [PATCH v3 02/14] hw/char/serial-pci-multi: Batch register types using DEFINE_TYPES macro Philippe Mathieu-Daudé
2023-02-13 18:43 ` [PATCH v3 03/14] hw/char/serial-pci-multi: Introduce PCI_MULTISERIAL QOM abstract parent Philippe Mathieu-Daudé
2023-02-13 18:43 ` [PATCH v3 04/14] hw/char/serial-pci-multi: Factor multi_serial_class_initfn() out Philippe Mathieu-Daudé
2023-02-14 16:07 ` Bernhard Beschow
2023-02-13 18:43 ` [PATCH v3 05/14] hw/char/serial-pci-multi: Replace DO_UPCAST() by PCI_MULTISERIAL() Philippe Mathieu-Daudé
2023-02-13 18:43 ` [PATCH v3 06/14] hw/ide/qdev: Replace DO_UPCAST(IDEDevice) by IDE_DEVICE() Philippe Mathieu-Daudé
2023-02-13 18:43 ` Philippe Mathieu-Daudé [this message]
2023-02-13 18:43 ` [PATCH v3 08/14] hw/net/ne2000-pci: Replace DO_UPCAST(PCINE2000State) by PCI_NE2000() Philippe Mathieu-Daudé
2023-02-28 13:39 ` Philippe Mathieu-Daudé
2023-02-13 18:43 ` [PATCH v3 09/14] hw/net/tulip: Finish QOM conversion Philippe Mathieu-Daudé
2023-02-28 13:39 ` Philippe Mathieu-Daudé
2023-03-06 3:03 ` Jason Wang
2023-02-13 18:43 ` [PATCH v3 10/14] hw/pci/pci: Replace DO_UPCAST(PCIBus) by PCI_BUS() Philippe Mathieu-Daudé
2023-02-13 18:43 ` [PATCH v3 11/14] hw/scsi/scsi-bus: Replace DO_UPCAST(SCSIBus) by SCSI_BUS() Philippe Mathieu-Daudé
2023-02-13 18:43 ` [PATCH v3 12/14] hw/scsi/scsi-bus: Inline two uses of scsi_bus_from_device() Philippe Mathieu-Daudé
2023-02-13 18:43 ` [PATCH v3 13/14] hw/usb/dev-hub: Use QOM USB_HUB() macro instead of casting Philippe Mathieu-Daudé
2023-02-13 18:43 ` [PATCH v3 14/14] hw/usb: Replace DO_UPCAST(USBBus) by USB_BUS() Philippe Mathieu-Daudé
2023-02-28 13:43 ` [PATCH v3 00/14] hw: Use QOM macros and remove DO_UPCAST() uses Philippe Mathieu-Daudé
2023-02-28 13:44 ` Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230213184338.46712-8-philmd@linaro.org \
--to=philmd@linaro.org \
--cc=arei.gonglei@huawei.com \
--cc=caoj.fnst@cn.fujitsu.com \
--cc=eduardo@habkost.net \
--cc=hutao@cn.fujitsu.com \
--cc=jsnow@redhat.com \
--cc=liq3ea@163.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=thuth@redhat.com \
--cc=zxq_yx_007@163.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).