From nobody Wed Nov 5 20:19:49 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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1536757427876817.7438767548248; Wed, 12 Sep 2018 06:03:47 -0700 (PDT) Received: from localhost ([::1]:36184 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g04o1-0004D1-2F for importer@patchew.org; Wed, 12 Sep 2018 09:03:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33117) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g04gp-0007Zk-WB for qemu-devel@nongnu.org; Wed, 12 Sep 2018 08:56:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g04gp-00088C-0b for qemu-devel@nongnu.org; Wed, 12 Sep 2018 08:56:15 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:55040 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1g04go-00087E-Pr for qemu-devel@nongnu.org; Wed, 12 Sep 2018 08:56:14 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6232E8011059; Wed, 12 Sep 2018 12:56:14 +0000 (UTC) Received: from localhost (ovpn-112-57.ams2.redhat.com [10.36.112.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id CA832FA996; Wed, 12 Sep 2018 12:56:09 +0000 (UTC) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Wed, 12 Sep 2018 16:55:27 +0400 Message-Id: <20180912125531.32131-6-marcandre.lureau@redhat.com> In-Reply-To: <20180912125531.32131-1-marcandre.lureau@redhat.com> References: <20180912125531.32131-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Wed, 12 Sep 2018 12:56:14 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Wed, 12 Sep 2018 12:56:14 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'marcandre.lureau@redhat.com' RCPT:'' Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH 5/9] qom/globals: generalize object_property_set_globals() 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: Eduardo Habkost , "Michael S. Tsirkin" , Mark Cave-Ayland , dgilbert@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Igor Mammedov , Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Artyom Tarasenko , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RDMRC_1 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" 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 *pr= op) =20 void object_property_set_globals(Object *obj) { - DeviceState *dev =3D DEVICE(obj); GList *l; + DeviceState *dev =3D (DeviceState *)object_dynamic_cast(obj, TYPE_DEVI= CE); + + 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, &e= rr); + 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.rc1