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/versatilepb.c | |
| parent | 6fd8e79af031d8cfc0eb02d40d03281917fcb27b (diff) | |
| download | qemu-1356b98d3e95a85071e6bf9a99e8799e1ae1bbee.tar.gz | |
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/versatilepb.c')
| -rw-r--r-- | hw/versatilepb.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/hw/versatilepb.c b/hw/versatilepb.c index 7a1b20b36c..e0a28f08d3 100644 --- a/hw/versatilepb.c +++ b/hw/versatilepb.c @@ -203,7 +203,7 @@ static void versatile_init(QEMUMachineInitArgs *args, int board_id) qdev_prop_set_uint32(sysctl, "sys_id", 0x41007004); qdev_prop_set_uint32(sysctl, "proc_id", 0x02000000); qdev_init_nofail(sysctl); - sysbus_mmio_map(sysbus_from_qdev(sysctl), 0, 0x10000000); + sysbus_mmio_map(SYS_BUS_DEVICE(sysctl), 0, 0x10000000); cpu_pic = arm_pic_init_cpu(cpu); dev = sysbus_create_varargs("pl190", 0x10140000, @@ -214,7 +214,7 @@ static void versatile_init(QEMUMachineInitArgs *args, int board_id) } dev = sysbus_create_simple("versatilepb_sic", 0x10003000, NULL); for (n = 0; n < 32; n++) { - sysbus_connect_irq(sysbus_from_qdev(dev), n, pic[n]); + sysbus_connect_irq(SYS_BUS_DEVICE(dev), n, pic[n]); sic[n] = qdev_get_gpio_in(dev, n); } @@ -222,7 +222,7 @@ static void versatile_init(QEMUMachineInitArgs *args, int board_id) sysbus_create_simple("pl050_mouse", 0x10007000, sic[4]); dev = qdev_create(NULL, "versatile_pci"); - busdev = sysbus_from_qdev(dev); + busdev = SYS_BUS_DEVICE(dev); qdev_init_nofail(dev); sysbus_mmio_map(busdev, 0, 0x41000000); /* PCI self-config */ sysbus_mmio_map(busdev, 1, 0x42000000); /* PCI config */ @@ -287,8 +287,8 @@ static void versatile_init(QEMUMachineInitArgs *args, int board_id) 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, sic[24]); + sysbus_mmio_map(SYS_BUS_DEVICE(pl041), 0, 0x10004000); + sysbus_connect_irq(SYS_BUS_DEVICE(pl041), 0, sic[24]); /* Memory map for Versatile/PB: */ /* 0x10000000 System registers. */ |