From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53026) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gHVbX-0004Sh-Mg for qemu-devel@nongnu.org; Tue, 30 Oct 2018 11:06:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gHVbS-0002pE-Bd for qemu-devel@nongnu.org; Tue, 30 Oct 2018 11:06:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57324) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gHVbR-0002dc-Sh for qemu-devel@nongnu.org; Tue, 30 Oct 2018 11:06:46 -0400 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Tue, 30 Oct 2018 19:04:48 +0400 Message-Id: <20181030150453.9344-6-marcandre.lureau@redhat.com> In-Reply-To: <20181030150453.9344-1-marcandre.lureau@redhat.com> References: <20181030150453.9344-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 v2 05/10] qom/globals: generalize object_property_set_globals() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Amit Shah , Eduardo Habkost , Marcel Apfelbaum , dgilbert@redhat.com, Richard Henderson , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Igor Mammedov , "Michael S. Tsirkin" , Artyom Tarasenko , Mark Cave-Ayland , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Handle calls of object_property_set_globals() with any object type, but only apply globals to TYPE_DEVICE & TYPE_USER_CREATABLE. Signed-off-by: Marc-Andr=C3=A9 Lureau --- qom/globals.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/qom/globals.c b/qom/globals.c index 587f4a1b5c..8664baebe0 100644 --- a/qom/globals.c +++ b/qom/globals.c @@ -15,22 +15,28 @@ void object_property_register_global(GlobalProperty *= prop) =20 void object_property_set_globals(Object *obj) { - DeviceState *dev =3D DEVICE(obj); GList *l; + DeviceState *dev =3D (DeviceState *)object_dynamic_cast(obj, TYPE_DE= VICE); + + if (!dev && !IS_USER_CREATABLE(obj)) { + /* only TYPE_DEVICE and TYPE_USER_CREATABLE support globals */ + return; + } =20 for (l =3D global_props; l; l =3D l->next) { GlobalProperty *prop =3D l->data; Error *err =3D NULL; =20 - if (object_dynamic_cast(OBJECT(dev), prop->driver) =3D=3D NULL) = { + if (object_dynamic_cast(obj, prop->driver) =3D=3D NULL) { continue; } prop->used =3D true; - object_property_parse(OBJECT(dev), prop->value, prop->property, = &err); + object_property_parse(obj, prop->value, prop->property, &err); if (err !=3D NULL) { error_prepend(&err, "can't apply global %s.%s=3D%s: ", prop->driver, prop->property, prop->value); - if (!dev->hotplugged && prop->errp) { + + if (dev && !dev->hotplugged && prop->errp) { error_propagate(prop->errp, err); } else { assert(prop->user_provided); @@ -56,15 +62,15 @@ int object_property_check_globals(void) continue; } oc =3D object_class_by_name(prop->driver); - oc =3D object_class_dynamic_cast(oc, TYPE_DEVICE); - if (!oc) { + dc =3D (DeviceClass *)object_class_dynamic_cast(oc, TYPE_DEVICE)= ; + if (!IS_USER_CREATABLE_CLASS(oc) && !dc) { warn_report("global %s.%s has invalid class name", prop->driver, prop->property); ret =3D 1; continue; } - dc =3D DEVICE_CLASS(oc); - if (!dc->hotpluggable && !prop->used) { + + if (dc && !dc->hotpluggable) { warn_report("global %s.%s=3D%s not used", prop->driver, prop->property, prop->value); ret =3D 1; --=20 2.19.0.271.gfe8321ec05