[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 2/6] hw/char: QOM'ify etraxfs_ser.c
From: |
Paolo Bonzini |
Subject: |
Re: [Qemu-devel] [PATCH 2/6] hw/char: QOM'ify etraxfs_ser.c |
Date: |
Mon, 9 May 2016 12:51:26 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.7.1 |
On 17/03/2016 10:20, xiaoqiang zhao wrote:
> Drop the old SysBus init function and use instance_init
>
> Signed-off-by: xiaoqiang zhao <address@hidden>
> ---
> hw/char/etraxfs_ser.c | 11 +++++------
> 1 file changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/hw/char/etraxfs_ser.c b/hw/char/etraxfs_ser.c
> index 146b387..ede7024 100644
> --- a/hw/char/etraxfs_ser.c
> +++ b/hw/char/etraxfs_ser.c
> @@ -209,12 +209,13 @@ static void etraxfs_ser_reset(DeviceState *d)
>
> }
>
> -static int etraxfs_ser_init(SysBusDevice *dev)
> +static void etraxfs_ser_init(Object *obj)
> {
> - ETRAXSerial *s = ETRAX_SERIAL(dev);
> + ETRAXSerial *s = ETRAX_SERIAL(obj);
> + SysBusDevice *dev = SYS_BUS_DEVICE(obj);
>
> sysbus_init_irq(dev, &s->irq);
> - memory_region_init_io(&s->mmio, OBJECT(s), &ser_ops, s,
> + memory_region_init_io(&s->mmio, obj, &ser_ops, s,
> "etraxfs-serial", R_MAX * 4);
> sysbus_init_mmio(dev, &s->mmio);
>
> @@ -225,15 +226,12 @@ static int etraxfs_ser_init(SysBusDevice *dev)
> serial_can_receive, serial_receive,
> serial_event, s);
The missing context has a qemu_char_get_next_serial() call, so this
patch is not good either.
Paolo
> }
> - return 0;
> }
>
> static void etraxfs_ser_class_init(ObjectClass *klass, void *data)
> {
> DeviceClass *dc = DEVICE_CLASS(klass);
> - SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
>
> - k->init = etraxfs_ser_init;
> dc->reset = etraxfs_ser_reset;
> /* Reason: init() method uses qemu_char_get_next_serial() */
> dc->cannot_instantiate_with_device_add_yet = true;
> @@ -243,6 +241,7 @@ static const TypeInfo etraxfs_ser_info = {
> .name = TYPE_ETRAX_FS_SERIAL,
> .parent = TYPE_SYS_BUS_DEVICE,
> .instance_size = sizeof(ETRAXSerial),
> + .instance_init = etraxfs_ser_init,
> .class_init = etraxfs_ser_class_init,
> };
>
>