[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 05/19] hw/char/serial-pci-multi: Replace DO_UPCAST() by PCI_MULTI
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 05/19] hw/char/serial-pci-multi: Replace DO_UPCAST() by PCI_MULTISERIAL() |
Date: |
Sun, 12 Feb 2023 23:51:30 +0100 |
Use the PCI_MULTISERIAL() QOM type-checking macro to avoid the few
DO_UPCAST(PCIMultiSerialState) calls.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/char/serial-pci-multi.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/hw/char/serial-pci-multi.c b/hw/char/serial-pci-multi.c
index cd5af24bd2..6f4491210d 100644
--- a/hw/char/serial-pci-multi.c
+++ b/hw/char/serial-pci-multi.c
@@ -58,7 +58,7 @@ struct PCIMultiSerialState {
static void multi_serial_pci_exit(PCIDevice *dev)
{
- PCIMultiSerialState *pci = DO_UPCAST(PCIMultiSerialState, dev, dev);
+ PCIMultiSerialState *pci = PCI_MULTISERIAL(dev);
SerialState *s;
int i;
@@ -97,11 +97,10 @@ static size_t multi_serial_get_port_count(PCIDeviceClass
*pc)
g_assert_not_reached();
}
-
static void multi_serial_pci_realize(PCIDevice *dev, Error **errp)
{
PCIDeviceClass *pc = PCI_DEVICE_GET_CLASS(dev);
- PCIMultiSerialState *pci = DO_UPCAST(PCIMultiSerialState, dev, dev);
+ PCIMultiSerialState *pci = PCI_MULTISERIAL(dev);
SerialState *s;
size_t i, nports = multi_serial_get_port_count(pc);
@@ -190,9 +189,8 @@ static void multi_4x_serial_pci_class_initfn(ObjectClass
*klass, void *data)
static void multi_serial_init(Object *o)
{
- PCIDevice *dev = PCI_DEVICE(o);
- PCIMultiSerialState *pms = DO_UPCAST(PCIMultiSerialState, dev, dev);
- size_t i, nports = multi_serial_get_port_count(PCI_DEVICE_GET_CLASS(dev));
+ PCIMultiSerialState *pms = PCI_MULTISERIAL(o);
+ size_t i, nports = multi_serial_get_port_count(PCI_DEVICE_GET_CLASS(o));
for (i = 0; i < nports; i++) {
object_initialize_child(o, "serial[*]", &pms->state[i], TYPE_SERIAL);
--
2.38.1
- [PATCH 00/19] hw: Use QOM macros and remove DO_UPCAST() uses, Philippe Mathieu-Daudé, 2023/02/12
- [PATCH 01/19] hw/char/serial-pci: Replace DO_UPCAST(PCISerialState) by PCI_SERIAL(), Philippe Mathieu-Daudé, 2023/02/12
- [PATCH 02/19] hw/char/serial-pci-multi: Batch register types using DEFINE_TYPES macro, Philippe Mathieu-Daudé, 2023/02/12
- [PATCH 03/19] hw/char/serial-pci-multi: Introduce PCI_MULTISERIAL QOM abstract parent, Philippe Mathieu-Daudé, 2023/02/12
- [PATCH 04/19] hw/char/serial-pci-multi: Factor multi_serial_class_initfn() out, Philippe Mathieu-Daudé, 2023/02/12
- [PATCH 05/19] hw/char/serial-pci-multi: Replace DO_UPCAST() by PCI_MULTISERIAL(),
Philippe Mathieu-Daudé <=
- [PATCH 06/19] hw/ide/qdev: Replace DO_UPCAST(IDEDevice) by IDE_DEVICE(), Philippe Mathieu-Daudé, 2023/02/12
- [PATCH 07/19] hw/ide/qdev: Replace DO_UPCAST(IDEBus) by IDE_BUS(), Philippe Mathieu-Daudé, 2023/02/12
- [PATCH 08/19] hw/net/eepro100: Introduce TYPE_EEPRO100 QOM abstract parent, Philippe Mathieu-Daudé, 2023/02/12
- [PATCH 09/19] hw/net/eepro100: Replace DO_UPCAST(EEPRO100State) by EEPRO100(), Philippe Mathieu-Daudé, 2023/02/12
- [PATCH 10/19] hw/net/ne2000-pci: Replace DO_UPCAST(PCINE2000State) by PCI_NE2000(), Philippe Mathieu-Daudé, 2023/02/12
- [PATCH 11/19] hw/net/tulip: Finish QOM conversion, Philippe Mathieu-Daudé, 2023/02/12
- [PATCH 12/19] hw/pci/pci: Replace DO_UPCAST(PCIBus) by PCI_BUS(), Philippe Mathieu-Daudé, 2023/02/12
- [PATCH 14/19] hw/scsi/scsi-bus: Inline two uses of scsi_bus_from_device(), Philippe Mathieu-Daudé, 2023/02/12
- [PATCH 13/19] hw/scsi/scsi-bus: Replace DO_UPCAST(SCSIBus) by SCSI_BUS(), Philippe Mathieu-Daudé, 2023/02/12
- [PATCH 15/19] hw/s390x/event-facility: Replace DO_UPCAST(SCLPEvent) by SCLP_EVENT(), Philippe Mathieu-Daudé, 2023/02/12