Re: [Qemu-devel] [PATCH 06/10] vmmouse: convert to qdev

[Blue Swirl]

On Sat, Feb 12, 2011 at 7:03 PM, Markus Armbruster <address@hidden> wrote:
> Blue Swirl <address@hidden> writes:
>
>> Convert to qdev, also add a proper reset function.
>>
>> Signed-off-by: Blue Swirl <address@hidden>
>> ---
>>  hw/pc.c      |    5 +++--
>>  hw/pc.h      |    3 ---
>>  hw/vmmouse.c |   37 +++++++++++++++++++++++++++++--------
>>  3 files changed, 32 insertions(+), 13 deletions(-)
>>
>> diff --git a/hw/pc.c b/hw/pc.c
>> index fcee09a..f66ac5d 100644
>> --- a/hw/pc.c
>> +++ b/hw/pc.c
>> @@ -1096,7 +1096,7 @@ void pc_basic_device_init(qemu_irq *isa_irq,
>>      PITState *pit;
>>      qemu_irq rtc_irq = NULL;
>>      qemu_irq *a20_line;
>> -    ISADevice *i8042, *port92;
>> +    ISADevice *i8042, *port92, *vmmouse;
>>      qemu_irq *cpu_exit_irq;
>>
>>      register_ioport_write(0x80, 1, 1, ioport80_write, NULL);
>> @@ -1133,7 +1133,8 @@ void pc_basic_device_init(qemu_irq *isa_irq,
>>      a20_line = qemu_allocate_irqs(handle_a20_line_change, first_cpu, 2);
>>      i8042 = isa_create_simple("i8042");
>>      i8042_setup_a20_line(i8042, &a20_line[0]);
>> -    vmmouse_init(i8042);
>> +    vmmouse = isa_create("vmmouse");
>> +    qdev_prop_set_ptr(&vmmouse->qdev, "ps2_mouse", i8042);
>>      port92 = isa_create_simple("port92");
>>      port92_init(port92, &a20_line[1]);
>>
>> diff --git a/hw/pc.h b/hw/pc.h
>> index 603a2a3..ae83934 100644
>> --- a/hw/pc.h
>> +++ b/hw/pc.h
>> @@ -67,9 +67,6 @@ void hpet_pit_enable(void);
>>  /* vmport.c */
>>  void vmport_register(unsigned char command, IOPortReadFunc *func,
>> void *opaque);
>>
>> -/* vmmouse.c */
>> -void *vmmouse_init(void *m);
>> -
>>  /* pckbd.c */
>>
>>  void i8042_init(qemu_irq kbd_irq, qemu_irq mouse_irq, uint32_t io_base);
>> diff --git a/hw/vmmouse.c b/hw/vmmouse.c
>> index 2097119..3b39144 100644
>> --- a/hw/vmmouse.c
>> +++ b/hw/vmmouse.c
>> @@ -25,6 +25,7 @@
>>  #include "console.h"
>>  #include "ps2.h"
>>  #include "pc.h"
>> +#include "qdev.h"
>>
>>  /* debug only vmmouse */
>>  //#define DEBUG_VMMOUSE
>> @@ -52,6 +53,7 @@
>>
>>  typedef struct _VMMouseState
>>  {
>> +    ISADevice dev;
>>      uint32_t queue[VMMOUSE_QUEUE_SIZE];
>>      int32_t queue_size;
>>      uint16_t nb_queue;
>> @@ -270,22 +272,41 @@ static const VMStateDescription vmstate_vmmouse = {
>>      }
>>  };
>>
>> -void *vmmouse_init(void *m)
>> +static void vmmouse_reset(DeviceState *d)
>>  {
>> -    VMMouseState *s = NULL;
>> +    VMMouseState *s = container_of(d, VMMouseState, dev.qdev);
>>
>> -    DPRINTF("vmmouse_init\n");
>> +    s->status = 0xffff;
>> +}
>>
>> -    s = qemu_mallocz(sizeof(VMMouseState));
>> +static int vmmouse_initfn(ISADevice *dev)
>> +{
>> +    VMMouseState *s = DO_UPCAST(VMMouseState, dev, dev);
>>
>> -    s->status = 0xffff;
>> -    s->ps2_mouse = m;
>> -    s->queue_size = VMMOUSE_QUEUE_SIZE;
>
> Where is member queue_size initialized in your new code?

Good catch, nowhere. I'll fix it.

>> +    DPRINTF("vmmouse_init\n");
>>
>>      vmport_register(VMMOUSE_STATUS, vmmouse_ioport_read, s);
>>      vmport_register(VMMOUSE_COMMAND, vmmouse_ioport_read, s);
>>      vmport_register(VMMOUSE_DATA, vmmouse_ioport_read, s);
>>      vmstate_register(NULL, 0, &vmstate_vmmouse, s);
>>
>> -    return s;
>> +    return 0;
>> +}
>> +
>> +static ISADeviceInfo vmmouse_info = {
>> +    .init          = vmmouse_initfn,
>> +    .qdev.name     = "vmmouse",
>> +    .qdev.size     = sizeof(VMMouseState),
>> +    .qdev.no_user  = 1,
>> +    .qdev.reset    = vmmouse_reset,
>> +    .qdev.props = (Property[]) {
>> +        DEFINE_PROP_PTR("ps2_mouse", VMMouseState, ps2_mouse),
>
> Pointer properties are for dirty hacks only.  Is there really no better
> solution?  Why does it have to be a property?

So that it can be set using qdev interfaces only.