[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 40/84] hw/ppc: Eliminate two superfluous QOM casts
|
From: |
Markus Armbruster |
|
Subject: |
[PULL 40/84] hw/ppc: Eliminate two superfluous QOM casts |
|
Date: |
Mon, 15 Jun 2020 22:39:24 +0200 |
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-15-armbru@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
---
hw/ppc/mac_newworld.c | 4 ++--
hw/ppc/mac_oldworld.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
index 69281d7834..2d069dcc59 100644
--- a/hw/ppc/mac_newworld.c
+++ b/hw/ppc/mac_newworld.c
@@ -122,7 +122,7 @@ static void ppc_core99_init(MachineState *machine)
long kernel_size, initrd_size;
UNINHostState *uninorth_pci;
PCIBus *pci_bus;
- NewWorldMacIOState *macio;
+ PCIDevice *macio;
bool has_pmu, has_adb;
MACIOIDEState *macio_ide;
BusState *adb_bus;
@@ -375,7 +375,7 @@ static void ppc_core99_init(MachineState *machine)
pci_bus = PCI_HOST_BRIDGE(uninorth_pci)->bus;
/* MacIO */
- macio = NEWWORLD_MACIO(pci_create(pci_bus, -1, TYPE_NEWWORLD_MACIO));
+ macio = pci_create(pci_bus, -1, TYPE_NEWWORLD_MACIO);
dev = DEVICE(macio);
qdev_prop_set_uint64(dev, "frequency", tbfreq);
qdev_prop_set_bit(dev, "has-pmu", has_pmu);
diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c
index cfc2eae1d9..f73ec5f3a9 100644
--- a/hw/ppc/mac_oldworld.c
+++ b/hw/ppc/mac_oldworld.c
@@ -94,7 +94,7 @@ static void ppc_heathrow_init(MachineState *machine)
uint32_t kernel_base, initrd_base, cmdline_base = 0;
int32_t kernel_size, initrd_size;
PCIBus *pci_bus;
- OldWorldMacIOState *macio;
+ PCIDevice *macio;
MACIOIDEState *macio_ide;
SysBusDevice *s;
DeviceState *dev, *pic_dev;
@@ -278,7 +278,7 @@ static void ppc_heathrow_init(MachineState *machine)
ide_drive_get(hd, ARRAY_SIZE(hd));
/* MacIO */
- macio = OLDWORLD_MACIO(pci_create(pci_bus, -1, TYPE_OLDWORLD_MACIO));
+ macio = pci_create(pci_bus, -1, TYPE_OLDWORLD_MACIO);
dev = DEVICE(macio);
qdev_prop_set_uint64(dev, "frequency", tbfreq);
object_property_set_link(OBJECT(macio), OBJECT(pic_dev), "pic",
--
2.26.2
- [PULL 03/84] arm/stm32f405: Fix realization of "stm32f2xx-adc" devices, (continued)
- [PULL 03/84] arm/stm32f405: Fix realization of "stm32f2xx-adc" devices, Markus Armbruster, 2020/06/15
- [PULL 36/84] qdev: Convert uses of qdev_create() manually, Markus Armbruster, 2020/06/15
- [PULL 20/84] display/sm501 display/ati: Fix to realize "i2c-ddc", Markus Armbruster, 2020/06/15
- [PULL 33/84] qdev: Convert to qdev_unrealize() with Coccinelle, Markus Armbruster, 2020/06/15
- [PULL 25/84] sd: Hide the qdev-but-not-quite thing created by sd_init(), Markus Armbruster, 2020/06/15
- [PULL 18/84] ppc/pnv: Put "*-pnv-chip" and "pnv-xive" on the main system bus, Markus Armbruster, 2020/06/15
- [PULL 37/84] qdev: Convert uses of qdev_set_parent_bus() with Coccinelle, Markus Armbruster, 2020/06/15
- [PULL 30/84] qdev: New qdev_new(), qdev_realize(), etc., Markus Armbruster, 2020/06/15
- [PULL 29/84] Revert "hw/versatile: realize the PCI root bus as part of the versatile init", Markus Armbruster, 2020/06/15
- [PULL 26/84] qdev: Assert onboard devices all get realized properly, Markus Armbruster, 2020/06/15
- [PULL 40/84] hw/ppc: Eliminate two superfluous QOM casts,
Markus Armbruster <=
- [PULL 23/84] sparc/leon3: Fix to put grlib,* devices on sysbus, Markus Armbruster, 2020/06/15
- [PULL 46/84] isa: Convert uses of isa_create(), isa_try_create() manually, Markus Armbruster, 2020/06/15
- [PULL 41/84] pci: Convert uses of pci_create() etc. with Coccinelle, Markus Armbruster, 2020/06/15
- [PULL 47/84] isa: isa_create(), isa_try_create() are now unused, drop, Markus Armbruster, 2020/06/15
- [PULL 51/84] ssi: ssi_create_slave_no_init() is now unused, drop, Markus Armbruster, 2020/06/15
- [PULL 53/84] usb: Convert uses of usb_create(), Markus Armbruster, 2020/06/15
- [PULL 32/84] qdev: Convert to qbus_realize(), qbus_unrealize(), Markus Armbruster, 2020/06/15
- [PULL 69/84] sysbus: Tidy up sysbus_init_child_obj()'s @childsize arg, part 2, Markus Armbruster, 2020/06/15
- [PULL 68/84] hw/arm/armsse: Pass correct child size to sysbus_init_child_obj(), Markus Armbruster, 2020/06/15
- [PULL 38/84] qdev: Convert uses of qdev_set_parent_bus() manually, Markus Armbruster, 2020/06/15