From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38623) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gaGlN-0004YT-3A for qemu-devel@nongnu.org; Fri, 21 Dec 2018 04:06:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gaGlH-0002KJ-Ly for qemu-devel@nongnu.org; Fri, 21 Dec 2018 04:06:33 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52168) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gaGlF-0002El-P5 for qemu-devel@nongnu.org; Fri, 21 Dec 2018 04:06:27 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A089736887 for ; Fri, 21 Dec 2018 09:06:20 +0000 (UTC) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Fri, 21 Dec 2018 13:04:04 +0400 Message-Id: <20181221090410.27250-23-marcandre.lureau@redhat.com> In-Reply-To: <20181221090410.27250-1-marcandre.lureau@redhat.com> References: <20181221090410.27250-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v7 22/28] qdev: make a separate helper function to apply compat properties List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: imammedo@redhat.com, ehabkost@redhat.com This will allow to apply compat properties on other objects than QDev eas= ily. Signed-off-by: Marc-Andr=C3=A9 Lureau --- include/hw/qdev-core.h | 2 ++ hw/core/qdev.c | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index 84e612f473..5989fb6565 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -422,6 +422,8 @@ const char *qdev_fw_name(DeviceState *dev); =20 Object *qdev_get_machine(void); =20 +void object_apply_compat_props(Object *obj); + /* FIXME: make this a link<> */ void qdev_set_parent_bus(DeviceState *dev, BusState *bus); =20 diff --git a/hw/core/qdev.c b/hw/core/qdev.c index d510340bac..3769a2bccb 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -970,7 +970,7 @@ static void device_initfn(Object *obj) QLIST_INIT(&dev->gpios); } =20 -static void device_post_init(Object *obj) +void object_apply_compat_props(Object *obj) { if (object_dynamic_cast(qdev_get_machine(), TYPE_MACHINE)) { MachineState *m =3D MACHINE(qdev_get_machine()); @@ -982,7 +982,11 @@ static void device_post_init(Object *obj) } object_apply_global_props(obj, mc->compat_props, &error_abort); } +} =20 +static void device_post_init(Object *obj) +{ + object_apply_compat_props(obj); qdev_prop_set_globals(DEVICE(obj)); } =20 --=20 2.20.1.2.gb21ebb671b