Re: [Qemu-devel] [PATCH 2/2] hw: vmmouse: drop DEFINE_PROP_PTR()

[Markus Armbruster <armbru@redhat.com>]

Li Qiang <liq3ea@gmail.com> writes:

> Use link property instead.
>
> Signed-off-by: Li Qiang <liq3ea@gmail.com>
> ---
>  hw/i386/pc.c      |  2 +-
>  hw/i386/vmmouse.c | 17 +++++++++++------
>  2 files changed, 12 insertions(+), 7 deletions(-)
>
> diff --git a/hw/i386/pc.c b/hw/i386/pc.c
> index 5d3fd86b83..9b343b4fd1 100644
> --- a/hw/i386/pc.c
> +++ b/hw/i386/pc.c
> @@ -1549,7 +1549,7 @@ static void pc_superio_init(ISABus *isa_bus, bool create_fdctrl, bool no_vmport)
>      }
>      if (vmmouse) {
>          DeviceState *dev = DEVICE(vmmouse);
> -        qdev_prop_set_ptr(dev, "ps2_mouse", i8042);
> +        object_property_set_link(OBJECT(dev), OBJECT(i8042), "ps2_mouse", NULL);

NULL is correct if this can fail, but the failure is to be silently
ignored.  Seems unlikely.  If it isn't expected to fail, use
&error_abort.  If failure should immediately terminate QEMU, use
&error_fatal.

>          qdev_init_nofail(dev);
>      }
>      port92 = isa_create_simple(isa_bus, TYPE_PORT92);
> diff --git a/hw/i386/vmmouse.c b/hw/i386/vmmouse.c
> index 5d2d278be4..612675d651 100644
> --- a/hw/i386/vmmouse.c
> +++ b/hw/i386/vmmouse.c
> @@ -27,6 +27,7 @@
>  #include "hw/i386/pc.h"
>  #include "hw/input/i8042.h"
>  #include "hw/qdev.h"
> +#include "qapi/error.h"
>  
>  /* debug only vmmouse */
>  //#define DEBUG_VMMOUSE
> @@ -272,10 +273,15 @@ static void vmmouse_realizefn(DeviceState *dev, Error **errp)
>      vmport_register(VMMOUSE_DATA, vmmouse_ioport_read, s);
>  }
>  
> -static Property vmmouse_properties[] = {
> -    DEFINE_PROP_PTR("ps2_mouse", VMMouseState, ps2_mouse),
> -    DEFINE_PROP_END_OF_LIST(),
> -};
> +static void vmmouse_instance_initfn(Object *obj)
> +{
> +    VMMouseState *s = VMMOUSE(obj);
> +
> +    object_property_add_link(obj, "ps2_mouse", TYPE_I8042,
> +                             (Object **)&s->ps2_mouse,
> +                             qdev_prop_allow_set_link_before_realize,
> +                             0, &error_abort);
> +}
>  
>  static void vmmouse_class_initfn(ObjectClass *klass, void *data)
>  {
> @@ -284,8 +290,6 @@ static void vmmouse_class_initfn(ObjectClass *klass, void *data)
>      dc->realize = vmmouse_realizefn;
>      dc->reset = vmmouse_reset;
>      dc->vmsd = &vmstate_vmmouse;
> -    dc->props = vmmouse_properties;
> -    /* Reason: pointer property "ps2_mouse" */
>      dc->user_creatable = false;
>  }
>  
> @@ -293,6 +297,7 @@ static const TypeInfo vmmouse_info = {
>      .name          = TYPE_VMMOUSE,
>      .parent        = TYPE_ISA_DEVICE,
>      .instance_size = sizeof(VMMouseState),
> +    .instance_init = vmmouse_instance_initfn,
>      .class_init    = vmmouse_class_initfn,
>  };

Looks good to me otherwise.