openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

hw/ppc: Eliminate two superfluous QOM casts 

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>
This commit is contained in:
Markus Armbruster 2020-06-10 07:32:03 +02:00
parent 7411aa63a5
commit 7d61226158
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/ppc/mac_newworld.c
View File

@ -122,7 +122,7 @@ static void ppc_core99_init(MachineState *machine)
long kernel_size, initrd_size; long kernel_size, initrd_size;
UNINHostState *uninorth_pci; UNINHostState *uninorth_pci;
PCIBus *pci_bus; PCIBus *pci_bus;
NewWorldMacIOState *macio; PCIDevice *macio;
bool has_pmu, has_adb; bool has_pmu, has_adb;
MACIOIDEState *macio_ide; MACIOIDEState *macio_ide;
BusState *adb_bus; BusState *adb_bus;
@ -375,7 +375,7 @@ static void ppc_core99_init(MachineState *machine)
pci_bus = PCI_HOST_BRIDGE(uninorth_pci)->bus; pci_bus = PCI_HOST_BRIDGE(uninorth_pci)->bus;
/* MacIO */ /* MacIO */
macio = NEWWORLD_MACIO(pci_create(pci_bus, -1, TYPE_NEWWORLD_MACIO)); macio = pci_create(pci_bus, -1, TYPE_NEWWORLD_MACIO);
dev = DEVICE(macio); dev = DEVICE(macio);
qdev_prop_set_uint64(dev, "frequency", tbfreq); qdev_prop_set_uint64(dev, "frequency", tbfreq);
qdev_prop_set_bit(dev, "has-pmu", has_pmu); qdev_prop_set_bit(dev, "has-pmu", has_pmu);

4
hw/ppc/mac_oldworld.c
View File

@ -94,7 +94,7 @@ static void ppc_heathrow_init(MachineState *machine)
uint32_t kernel_base, initrd_base, cmdline_base = 0; uint32_t kernel_base, initrd_base, cmdline_base = 0;
int32_t kernel_size, initrd_size; int32_t kernel_size, initrd_size;
PCIBus *pci_bus; PCIBus *pci_bus;
OldWorldMacIOState *macio; PCIDevice *macio;
MACIOIDEState *macio_ide; MACIOIDEState *macio_ide;
SysBusDevice *s; SysBusDevice *s;
DeviceState *dev, *pic_dev; DeviceState *dev, *pic_dev;
@ -278,7 +278,7 @@ static void ppc_heathrow_init(MachineState *machine)
ide_drive_get(hd, ARRAY_SIZE(hd)); ide_drive_get(hd, ARRAY_SIZE(hd));
/* MacIO */ /* MacIO */
macio = OLDWORLD_MACIO(pci_create(pci_bus, -1, TYPE_OLDWORLD_MACIO)); macio = pci_create(pci_bus, -1, TYPE_OLDWORLD_MACIO);
dev = DEVICE(macio); dev = DEVICE(macio);
qdev_prop_set_uint64(dev, "frequency", tbfreq); qdev_prop_set_uint64(dev, "frequency", tbfreq);
object_property_set_link(OBJECT(macio), OBJECT(pic_dev), "pic", object_property_set_link(OBJECT(macio), OBJECT(pic_dev), "pic",