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/grlib.h | |
| 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/grlib.h')
| -rw-r--r-- | hw/grlib.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/hw/grlib.h b/hw/grlib.h index 35c22f599..afd53892b 100644 --- a/hw/grlib.h +++ b/hw/grlib.h @@ -61,7 +61,7 @@ DeviceState *grlib_irqmp_create(hwaddr base, env->irq_manager = dev; - sysbus_mmio_map(sysbus_from_qdev(dev), 0, base); + sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, base); *cpu_irqs = qemu_allocate_irqs(grlib_irqmp_set_irq, dev, @@ -91,10 +91,10 @@ DeviceState *grlib_gptimer_create(hwaddr base, return NULL; } - sysbus_mmio_map(sysbus_from_qdev(dev), 0, base); + sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, base); for (i = 0; i < nr_timers; i++) { - sysbus_connect_irq(sysbus_from_qdev(dev), i, cpu_irqs[base_irq + i]); + sysbus_connect_irq(SYS_BUS_DEVICE(dev), i, cpu_irqs[base_irq + i]); } return dev; @@ -116,9 +116,9 @@ DeviceState *grlib_apbuart_create(hwaddr base, return NULL; } - sysbus_mmio_map(sysbus_from_qdev(dev), 0, base); + sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, base); - sysbus_connect_irq(sysbus_from_qdev(dev), 0, irq); + sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, irq); return dev; } |