[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v3 1/1] char: cadence_uart: Convert to realize()
From: |
Andreas Färber |
Subject: |
Re: [Qemu-devel] [PATCH v3 1/1] char: cadence_uart: Convert to realize() |
Date: |
Fri, 27 Feb 2015 18:59:56 +0100 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 |
Am 27.02.2015 um 02:48 schrieb Alistair Francis:
> Use the DeviceClass realize() and init() instead of
> the deprecated SysBusDevice init().
>
> Signed-off-by: Alistair Francis <address@hidden>
> Reviewed-by: Peter Crosthwaite <address@hidden>
Thanks, applied to qom-next with some wording/syntax changes and the
following QOM cast cleanup:
diff --git a/hw/char/cadence_uart.c b/hw/char/cadence_uart.c
index a713a08..36084d5 100644
--- a/hw/char/cadence_uart.c
+++ b/hw/char/cadence_uart.c
@@ -494,10 +494,11 @@ static void cadence_uart_realize(DeviceState *dev,
Error **errp)
static void cadence_uart_init(Object *obj)
{
UartState *s = CADENCE_UART(obj);
+ SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
memory_region_init_io(&s->iomem, obj, &uart_ops, s, "uart", 0x1000);
- sysbus_init_mmio(SYS_BUS_DEVICE(obj), &s->iomem);
- sysbus_init_irq(SYS_BUS_DEVICE(obj), &s->irq);
+ sysbus_init_mmio(sbd, &s->iomem);
+ sysbus_init_irq(sbd, &s->irq);
s->char_tx_time = (get_ticks_per_sec() / 9600) * 10;
}
fixing myself up with the canonical order:
diff --git a/hw/char/cadence_uart.c b/hw/char/cadence_uart.c
index 36084d5..a5dc2a4 100644
--- a/hw/char/cadence_uart.c
+++ b/hw/char/cadence_uart.c
@@ -493,8 +493,8 @@ static void cadence_uart_realize(DeviceState *dev,
Error **errp)
static void cadence_uart_init(Object *obj)
{
- UartState *s = CADENCE_UART(obj);
SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
+ UartState *s = CADENCE_UART(obj);
memory_region_init_io(&s->iomem, obj, &uart_ops, s, "uart", 0x1000);
sysbus_init_mmio(sbd, &s->iomem);
https://github.com/afaerber/qemu-cpu/commits/qom-next
Regards,
Andreas
--
SUSE Linux GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Felix Imendörffer, Jane Smithard, Jennifer Guild, Dilip Upmanyu,
Graham Norton; HRB 21284 (AG Nürnberg)