From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: Li Qiang <liq3ea@gmail.com>,
mst@redhat.com, pbonzini@redhat.com, ehabkost@redhat.com,
armbru@redhat.com, Thomas Huth <thuth@redhat.com>
Cc: marcel.apfelbaum@gmail.com, rth@twiddle.net,
darren.kenny@oracle.com, qemu-devel@nongnu.org
Subject: Re: [Qemu-devel] [PATCH v3 2/2] hw: vmmouse: Use link instead of pointer property
Date: Mon, 17 Dec 2018 13:43:30 +0100 [thread overview]
Message-ID: <644186db-32d3-7c83-8b37-02e8427ef217@redhat.com> (raw)
In-Reply-To: <1543467132-2873-3-git-send-email-liq3ea@gmail.com>
Hi Li,
On 11/29/18 5:52 AM, Li Qiang wrote:
> According to qdev-properties.h, properties of pointer type should
> be avoided. Turn "ps2_mouse" into a link.
>
> Reviewed-by: Markus Armbruster <armbru@redhat.com>
> Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
> Signed-off-by: Li Qiang <liq3ea@gmail.com>
> ---
>
> Change since v2: detailed commit message
>
> Change since v1: use error_abort in object_property_set_link()
>
> hw/i386/pc.c | 3 ++-
> hw/i386/vmmouse.c | 17 +++++++++++------
> 2 files changed, 13 insertions(+), 7 deletions(-)
>
> diff --git a/hw/i386/pc.c b/hw/i386/pc.c
> index 73c7b777a0..64f0f233b8 100644
> --- a/hw/i386/pc.c
> +++ b/hw/i386/pc.c
> @@ -1552,7 +1552,8 @@ 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", &error_abort);
> 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 4412eaf604..f63aac6673 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
> @@ -271,10 +272,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)
> {
> @@ -283,8 +289,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;
"user_creatable = false" must have an justification comment.
Can you keep 'Reason: link property "ps2_mouse"'?
Eventually the maintainer taking this patch can fix this for you.
With the comment:
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> }
>
> @@ -292,6 +296,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,
> };
>
>
next prev parent reply other threads:[~2018-12-17 12:43 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-29 4:52 [Qemu-devel] [PATCH v3 0/2] hw: vmmouse: use link property instead of DEFINE_PROP_PTR Li Qiang
2018-11-29 4:52 ` [Qemu-devel] [PATCH v3 1/2] hw: pc: use TYPE_XXX instead of constant strings Li Qiang
2018-12-17 12:32 ` Philippe Mathieu-Daudé
2018-11-29 4:52 ` [Qemu-devel] [PATCH v3 2/2] hw: vmmouse: Use link instead of pointer property Li Qiang
2018-12-17 12:43 ` Philippe Mathieu-Daudé [this message]
2018-12-17 19:01 ` Markus Armbruster
2018-12-17 19:37 ` Philippe Mathieu-Daudé
2018-12-18 7:09 ` Markus Armbruster
2018-12-18 8:49 ` Li Qiang
2018-12-17 1:10 ` [Qemu-devel] [PATCH v3 0/2] hw: vmmouse: use link property instead of DEFINE_PROP_PTR Li Qiang
2018-12-17 2:25 ` Michael S. Tsirkin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=644186db-32d3-7c83-8b37-02e8427ef217@redhat.com \
--to=philmd@redhat.com \
--cc=armbru@redhat.com \
--cc=darren.kenny@oracle.com \
--cc=ehabkost@redhat.com \
--cc=liq3ea@gmail.com \
--cc=marcel.apfelbaum@gmail.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=rth@twiddle.net \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).