diff options
| author | Andreas Färber <afaerber@suse.de> | 2013-01-20 02:47:33 +0100 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-01-21 13:52:24 -0600 |
| commit | 1356b98d3e95a85071e6bf9a99e8799e1ae1bbee (patch) | |
| tree | 26b8c982dec9507ac71f29914dfe09f0cfb9a848 /hw/realview.c | |
| parent | 6fd8e79af031d8cfc0eb02d40d03281917fcb27b (diff) | |
sysbus: Drop sysbus_from_qdev() cast macro
Replace by SYS_BUS_DEVICE() QOM cast macro using a scripted conversion.
Avoids the old macro creeping into new code.
Resolve a Coding Style warning in openpic code.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Cc: Anthony Liguori <anthony@codemonkey.ws>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/realview.c')
| -rw-r--r-- | hw/realview.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/hw/realview.c b/hw/realview.c index cecb67e4d5..78da7676c4 100644 --- a/hw/realview.c +++ b/hw/realview.c @@ -140,14 +140,14 @@ static void realview_init(QEMUMachineInitArgs *args, qdev_prop_set_uint32(sysctl, "sys_id", sys_id); qdev_prop_set_uint32(sysctl, "proc_id", proc_id); qdev_init_nofail(sysctl); - sysbus_mmio_map(sysbus_from_qdev(sysctl), 0, 0x10000000); + sysbus_mmio_map(SYS_BUS_DEVICE(sysctl), 0, 0x10000000); if (is_mpcore) { hwaddr periphbase; dev = qdev_create(NULL, is_pb ? "a9mpcore_priv": "realview_mpcore"); qdev_prop_set_uint32(dev, "num-cpu", smp_cpus); qdev_init_nofail(dev); - busdev = sysbus_from_qdev(dev); + busdev = SYS_BUS_DEVICE(dev); if (is_pb) { periphbase = 0x1f000000; } else { @@ -172,8 +172,8 @@ static void realview_init(QEMUMachineInitArgs *args, pl041 = qdev_create(NULL, "pl041"); qdev_prop_set_uint32(pl041, "nc_fifo_depth", 512); qdev_init_nofail(pl041); - sysbus_mmio_map(sysbus_from_qdev(pl041), 0, 0x10004000); - sysbus_connect_irq(sysbus_from_qdev(pl041), 0, pic[19]); + sysbus_mmio_map(SYS_BUS_DEVICE(pl041), 0, 0x10004000); + sysbus_connect_irq(SYS_BUS_DEVICE(pl041), 0, pic[19]); sysbus_create_simple("pl050_keyboard", 0x10006000, pic[20]); sysbus_create_simple("pl050_mouse", 0x10007000, pic[21]); @@ -215,7 +215,7 @@ static void realview_init(QEMUMachineInitArgs *args, if (!is_pb) { dev = qdev_create(NULL, "realview_pci"); - busdev = sysbus_from_qdev(dev); + busdev = SYS_BUS_DEVICE(dev); qdev_init_nofail(dev); sysbus_mmio_map(busdev, 0, 0x61000000); /* PCI self-config */ sysbus_mmio_map(busdev, 1, 0x62000000); /* PCI config */ |