From nobody Thu Nov 6 03:29:15 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1539574167486184.69815071128778; Sun, 14 Oct 2018 20:29:27 -0700 (PDT) Received: from localhost ([::1]:50195 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gBtZC-0006FM-4f for importer@patchew.org; Sun, 14 Oct 2018 23:29:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40938) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gBtXP-0005Bo-1T for qemu-devel@nongnu.org; Sun, 14 Oct 2018 23:27:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gBtXL-0000xE-Qv for qemu-devel@nongnu.org; Sun, 14 Oct 2018 23:27:22 -0400 Received: from cmccmta2.chinamobile.com ([221.176.66.80]:18809) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gBtXL-0000tu-5n for qemu-devel@nongnu.org; Sun, 14 Oct 2018 23:27:19 -0400 Received: from spf.mail.chinamobile.com (unknown[172.16.121.9]) by rmmx-syy-dmz-app07-12007 (RichMail) with SMTP id 2ee75bc409130b8-4bda8; Mon, 15 Oct 2018 11:27:15 +0800 (CST) Received: from localhost.localdomain (unknown[112.25.154.149]) by rmsmtp-syy-appsvr05-12005 (RichMail) with SMTP id 2ee55bc4090b7fb-56c37; Mon, 15 Oct 2018 11:27:15 +0800 (CST) X-RM-TRANSID: 2ee75bc409130b8-4bda8 X-RM-TagInfo: emlType=0 X-RM-SPAM-FLAG: 00000000 X-RM-TRANSID: 2ee55bc4090b7fb-56c37 From: Mao Zhongyi To: qemu-devel@nongnu.org Date: Mon, 15 Oct 2018 11:26:40 +0800 Message-Id: <20181015032642.16411-2-maozhongyi@cmss.chinamobile.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181015032642.16411-1-maozhongyi@cmss.chinamobile.com> References: <20181015032642.16411-1-maozhongyi@cmss.chinamobile.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 221.176.66.80 Subject: [Qemu-devel] [PATCH v3 1/3] audio: use TYPE_WM8750 instead of a hardcoded string X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Jan Kiszka , Gerd Hoffmann , Mao Zhongyi Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Cc: Jan Kiszka Cc: Peter Maydell Cc: Gerd Hoffmann Signed-off-by: Mao Zhongyi Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/arm/musicpal.c | 2 +- hw/audio/marvell_88w8618.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c index c807010e83..3dafb41b0b 100644 --- a/hw/arm/musicpal.c +++ b/hw/arm/musicpal.c @@ -1695,7 +1695,7 @@ static void musicpal_init(MachineState *machine) wm8750_dev =3D i2c_create_slave(i2c, TYPE_WM8750, MP_WM_ADDR); dev =3D qdev_create(NULL, "mv88w8618_audio"); s =3D SYS_BUS_DEVICE(dev); - qdev_prop_set_ptr(dev, "wm8750", wm8750_dev); + qdev_prop_set_ptr(dev, TYPE_WM8750, wm8750_dev); 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 e546892d3c..cf6ce6979b 100644 --- a/hw/audio/marvell_88w8618.c +++ b/hw/audio/marvell_88w8618.c @@ -280,7 +280,7 @@ static const VMStateDescription mv88w8618_audio_vmsd = =3D { }; =20 static Property mv88w8618_audio_properties[] =3D { - DEFINE_PROP_PTR("wm8750", mv88w8618_audio_state, wm), + DEFINE_PROP_PTR(TYPE_WM8750, mv88w8618_audio_state, wm), {/* end of list */}, }; =20 --=20 2.17.1 From nobody Thu Nov 6 03:29:15 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1539574261336299.89432976824605; Sun, 14 Oct 2018 20:31:01 -0700 (PDT) Received: from localhost ([::1]:50209 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gBtau-0007Ul-Dm for importer@patchew.org; Sun, 14 Oct 2018 23:31:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40956) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gBtXP-0005Bu-PJ for qemu-devel@nongnu.org; Sun, 14 Oct 2018 23:27:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gBtXM-0000xq-HJ for qemu-devel@nongnu.org; Sun, 14 Oct 2018 23:27:23 -0400 Received: from cmccmta3.chinamobile.com ([221.176.66.81]:45636) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gBtXL-0000uD-Rh for qemu-devel@nongnu.org; Sun, 14 Oct 2018 23:27:20 -0400 Received: from spf.mail.chinamobile.com (unknown[172.16.121.9]) by rmmx-syy-dmz-app09-12009 (RichMail) with SMTP id 2ee95bc40913475-4cb1f; Mon, 15 Oct 2018 11:27:16 +0800 (CST) Received: from localhost.localdomain (unknown[112.25.154.149]) by rmsmtp-syy-appsvr05-12005 (RichMail) with SMTP id 2ee55bc4090b7fb-56c3a; Mon, 15 Oct 2018 11:27:15 +0800 (CST) X-RM-TRANSID: 2ee95bc40913475-4cb1f X-RM-TagInfo: emlType=0 X-RM-SPAM-FLAG: 00000000 X-RM-TRANSID: 2ee55bc4090b7fb-56c3a From: Mao Zhongyi To: qemu-devel@nongnu.org Date: Mon, 15 Oct 2018 11:26:41 +0800 Message-Id: <20181015032642.16411-3-maozhongyi@cmss.chinamobile.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181015032642.16411-1-maozhongyi@cmss.chinamobile.com> References: <20181015032642.16411-1-maozhongyi@cmss.chinamobile.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 221.176.66.81 Subject: [Qemu-devel] [PATCH v3 2/3] audio: use object link instead of qdev property to pass wm8750 reference X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Jan Kiszka , Gerd Hoffmann , Mao Zhongyi , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 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 Cc: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Mao Zhongyi Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/arm/musicpal.c | 3 ++- hw/audio/marvell_88w8618.c | 13 ++++++------- 2 files changed, 8 insertions(+), 8 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 =3D i2c_create_slave(i2c, TYPE_WM8750, MP_WM_ADDR); dev =3D qdev_create(NULL, "mv88w8618_audio"); s =3D 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..271d02d0b1 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" =20 #define MP_AUDIO_SIZE 0x00001000 =20 @@ -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); } =20 static void mv88w8618_audio_realize(DeviceState *dev, Error **errp) @@ -279,11 +285,6 @@ static const VMStateDescription mv88w8618_audio_vmsd = =3D { } }; =20 -static Property mv88w8618_audio_properties[] =3D { - DEFINE_PROP_PTR(TYPE_WM8750, mv88w8618_audio_state, wm), - {/* end of list */}, -}; - static void mv88w8618_audio_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); @@ -291,8 +292,6 @@ static void mv88w8618_audio_class_init(ObjectClass *kla= ss, void *data) dc->realize =3D mv88w8618_audio_realize; dc->reset =3D mv88w8618_audio_reset; dc->vmsd =3D &mv88w8618_audio_vmsd; - dc->props =3D mv88w8618_audio_properties; - /* Reason: pointer property "wm8750" */ dc->user_creatable =3D false; } =20 --=20 2.17.1 From nobody Thu Nov 6 03:29:15 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1539574167971683.1431904486923; Sun, 14 Oct 2018 20:29:27 -0700 (PDT) Received: from localhost ([::1]:50196 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gBtZC-0006Fe-3t for importer@patchew.org; Sun, 14 Oct 2018 23:29:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40941) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gBtXP-0005Bp-29 for qemu-devel@nongnu.org; Sun, 14 Oct 2018 23:27:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gBtXM-0000xw-J3 for qemu-devel@nongnu.org; Sun, 14 Oct 2018 23:27:22 -0400 Received: from cmccmta2.chinamobile.com ([221.176.66.80]:18810) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gBtXL-0000uO-Tp for qemu-devel@nongnu.org; Sun, 14 Oct 2018 23:27:20 -0400 Received: from spf.mail.chinamobile.com (unknown[172.16.121.9]) by rmmx-syy-dmz-app07-12007 (RichMail) with SMTP id 2ee75bc409140bc-4bdac; Mon, 15 Oct 2018 11:27:16 +0800 (CST) Received: from localhost.localdomain (unknown[112.25.154.149]) by rmsmtp-syy-appsvr05-12005 (RichMail) with SMTP id 2ee55bc4090b7fb-56c3f; Mon, 15 Oct 2018 11:27:16 +0800 (CST) X-RM-TRANSID: 2ee75bc409140bc-4bdac X-RM-TagInfo: emlType=0 X-RM-SPAM-FLAG: 00000000 X-RM-TRANSID: 2ee55bc4090b7fb-56c3f From: Mao Zhongyi To: qemu-devel@nongnu.org Date: Mon, 15 Oct 2018 11:26:42 +0800 Message-Id: <20181015032642.16411-4-maozhongyi@cmss.chinamobile.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181015032642.16411-1-maozhongyi@cmss.chinamobile.com> References: <20181015032642.16411-1-maozhongyi@cmss.chinamobile.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 221.176.66.80 Subject: [Qemu-devel] [PATCH v3 3/3] audio: use TYPE_MV88W8618_AUDIO instead of hardcoded string X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jan Kiszka , Mao Zhongyi , Peter Maydell Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Cc: Jan Kiszka Cc: Philippe Mathieu-Daud=C3=A9 Cc: Peter Maydell Signed-off-by: Mao Zhongyi Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/arm/musicpal.c | 2 +- hw/audio/marvell_88w8618.c | 1 - include/hw/audio/wm8750.h | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c index ac266f9253..9648b3af44 100644 --- a/hw/arm/musicpal.c +++ b/hw/arm/musicpal.c @@ -1693,7 +1693,7 @@ static void musicpal_init(MachineState *machine) } =20 wm8750_dev =3D i2c_create_slave(i2c, TYPE_WM8750, MP_WM_ADDR); - dev =3D qdev_create(NULL, "mv88w8618_audio"); + dev =3D qdev_create(NULL, TYPE_MV88W8618_AUDIO); s =3D SYS_BUS_DEVICE(dev); object_property_set_link(OBJECT(dev), OBJECT(wm8750_dev), TYPE_WM8750, NULL); diff --git a/hw/audio/marvell_88w8618.c b/hw/audio/marvell_88w8618.c index 271d02d0b1..53cdce7988 100644 --- a/hw/audio/marvell_88w8618.c +++ b/hw/audio/marvell_88w8618.c @@ -39,7 +39,6 @@ #define MP_AUDIO_CLOCK_24MHZ (1 << 9) #define MP_AUDIO_MONO (1 << 14) =20 -#define TYPE_MV88W8618_AUDIO "mv88w8618_audio" #define MV88W8618_AUDIO(obj) \ OBJECT_CHECK(mv88w8618_audio_state, (obj), TYPE_MV88W8618_AUDIO) =20 diff --git a/include/hw/audio/wm8750.h b/include/hw/audio/wm8750.h index 84e7a119bb..e12cb886d1 100644 --- a/include/hw/audio/wm8750.h +++ b/include/hw/audio/wm8750.h @@ -17,6 +17,7 @@ #include "hw/hw.h" =20 #define TYPE_WM8750 "wm8750" +#define TYPE_MV88W8618_AUDIO "mv88w8618_audio" =20 typedef void data_req_cb(void *opaque, int free_out, int free_in); =20 --=20 2.17.1