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/armv7m.c | |
| parent | 6fd8e79af031d8cfc0eb02d40d03281917fcb27b (diff) | |
| download | hqemu-1356b98d3e95a85071e6bf9a99e8799e1ae1bbee.zip hqemu-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/armv7m.c')
| -rw-r--r-- | hw/armv7m.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/armv7m.c b/hw/armv7m.c index 98fe483..904696c 100644 --- a/hw/armv7m.c +++ b/hw/armv7m.c @@ -137,12 +137,12 @@ static void armv7m_bitband_init(void) dev = qdev_create(NULL, "ARM,bitband-memory"); qdev_prop_set_uint32(dev, "base", 0x20000000); qdev_init_nofail(dev); - sysbus_mmio_map(sysbus_from_qdev(dev), 0, 0x22000000); + sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, 0x22000000); dev = qdev_create(NULL, "ARM,bitband-memory"); qdev_prop_set_uint32(dev, "base", 0x40000000); qdev_init_nofail(dev); - sysbus_mmio_map(sysbus_from_qdev(dev), 0, 0x42000000); + sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, 0x42000000); } /* Board init. */ @@ -216,7 +216,7 @@ qemu_irq *armv7m_init(MemoryRegion *address_space_mem, env->nvic = nvic; qdev_init_nofail(nvic); cpu_pic = arm_pic_init_cpu(cpu); - sysbus_connect_irq(sysbus_from_qdev(nvic), 0, cpu_pic[ARM_PIC_CPU_IRQ]); + sysbus_connect_irq(SYS_BUS_DEVICE(nvic), 0, cpu_pic[ARM_PIC_CPU_IRQ]); for (i = 0; i < 64; i++) { pic[i] = qdev_get_gpio_in(nvic, i); } |
