From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44037) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gAu8M-00051g-Km for qemu-devel@nongnu.org; Fri, 12 Oct 2018 05:53:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gAu8H-0001bq-Lp for qemu-devel@nongnu.org; Fri, 12 Oct 2018 05:53:26 -0400 Received: from mail-wr1-f44.google.com ([209.85.221.44]:33599) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gAu8G-0001ZE-VP for qemu-devel@nongnu.org; Fri, 12 Oct 2018 05:53:21 -0400 Received: by mail-wr1-f44.google.com with SMTP id e4-v6so12757946wrs.0 for ; Fri, 12 Oct 2018 02:53:20 -0700 (PDT) References: <20181012083008.29027-1-maozhongyi@cmss.chinamobile.com> <20181012083008.29027-3-maozhongyi@cmss.chinamobile.com> From: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= Message-ID: Date: Fri, 12 Oct 2018 11:53:18 +0200 MIME-Version: 1.0 In-Reply-To: <20181012083008.29027-3-maozhongyi@cmss.chinamobile.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v2 2/3] audio: use object link instead of qdev property to pass wm8750 reference List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Mao Zhongyi , qemu-devel@nongnu.org Cc: Peter Maydell , Jan Kiszka , Gerd Hoffmann Hi Mao, On 12/10/2018 10:30, Mao Zhongyi wrote: > According to qdev-properties.h, properties of pointer type should > be avoided, it seems a link type property is a good substitution. > > Cc: Jan Kiszka > Cc: Peter Maydell > Cc: Gerd Hoffmann > To: qemu-arm@nongnu.org > > Signed-off-by: Mao Zhongyi > --- > hw/arm/musicpal.c | 3 ++- > hw/audio/marvell_88w8618.c | 14 ++++++-------- > 2 files changed, 8 insertions(+), 9 deletions(-) > > diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c > index 3dafb41b0b..ac266f9253 100644 > --- a/hw/arm/musicpal.c > +++ b/hw/arm/musicpal.c > @@ -1695,7 +1695,8 @@ static void musicpal_init(MachineState *machine) > wm8750_dev = i2c_create_slave(i2c, TYPE_WM8750, MP_WM_ADDR); > dev = qdev_create(NULL, "mv88w8618_audio"); > s = SYS_BUS_DEVICE(dev); > - qdev_prop_set_ptr(dev, TYPE_WM8750, wm8750_dev); > + object_property_set_link(OBJECT(dev), OBJECT(wm8750_dev), > + TYPE_WM8750, NULL); > qdev_init_nofail(dev); > sysbus_mmio_map(s, 0, MP_AUDIO_BASE); > sysbus_connect_irq(s, 0, pic[MP_AUDIO_IRQ]); > diff --git a/hw/audio/marvell_88w8618.c b/hw/audio/marvell_88w8618.c > index cf6ce6979b..baab4a3d53 100644 > --- a/hw/audio/marvell_88w8618.c > +++ b/hw/audio/marvell_88w8618.c > @@ -15,6 +15,7 @@ > #include "hw/i2c/i2c.h" > #include "hw/audio/wm8750.h" > #include "audio/audio.h" > +#include "qapi/error.h" > > #define MP_AUDIO_SIZE 0x00001000 > > @@ -252,6 +253,11 @@ static void mv88w8618_audio_init(Object *obj) > memory_region_init_io(&s->iomem, obj, &mv88w8618_audio_ops, s, > "audio", MP_AUDIO_SIZE); > sysbus_init_mmio(dev, &s->iomem); > + > + object_property_add_link(OBJECT(dev), "mv88w8618", TYPE_WM8750, > + (Object **) &s->wm, > + qdev_prop_allow_set_link_before_realize, > + 0, &error_abort); > } > > static void mv88w8618_audio_realize(DeviceState *dev, Error **errp) > @@ -279,11 +285,6 @@ static const VMStateDescription mv88w8618_audio_vmsd = { > } > }; > > -static Property mv88w8618_audio_properties[] = { > - DEFINE_PROP_PTR(TYPE_WM8750, mv88w8618_audio_state, wm), > - {/* end of list */}, > -}; > - > static void mv88w8618_audio_class_init(ObjectClass *klass, void *data) > { > DeviceClass *dc = DEVICE_CLASS(klass); > @@ -291,9 +292,6 @@ static void mv88w8618_audio_class_init(ObjectClass *klass, void *data) > dc->realize = mv88w8618_audio_realize; > dc->reset = mv88w8618_audio_reset; > dc->vmsd = &mv88w8618_audio_vmsd; > - dc->props = mv88w8618_audio_properties; > - /* Reason: pointer property "wm8750" */ > - dc->user_creatable = false; Having a link property isn't it the same restriction? > } > > static const TypeInfo mv88w8618_audio_info = { >