From nobody Tue May 7 03:14:33 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.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 (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 154708591074558.73293121790027; Wed, 9 Jan 2019 18:05:10 -0800 (PST) Received: from localhost ([127.0.0.1]:50963 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ghPiI-0007Mp-W2 for importer@patchew.org; Wed, 09 Jan 2019 21:04:55 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35019) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ghPgh-0006JF-0a for qemu-devel@nongnu.org; Wed, 09 Jan 2019 21:03:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ghPgg-0003GS-6Q for qemu-devel@nongnu.org; Wed, 09 Jan 2019 21:03:14 -0500 Received: from mx1.redhat.com ([209.132.183.28]:58912) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ghPgg-0003GI-13 for qemu-devel@nongnu.org; Wed, 09 Jan 2019 21:03:14 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4A93E29AC8; Thu, 10 Jan 2019 02:03:13 +0000 (UTC) Received: from localhost (ovpn-116-5.gru2.redhat.com [10.97.116.5]) by smtp.corp.redhat.com (Postfix) with ESMTP id 469CB10A1824; Thu, 10 Jan 2019 02:03:07 +0000 (UTC) From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Thu, 10 Jan 2019 00:02:57 -0200 Message-Id: <20190110020259.8492-2-ehabkost@redhat.com> In-Reply-To: <20190110020259.8492-1-ehabkost@redhat.com> References: <20190110020259.8492-1-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Thu, 10 Jan 2019 02:03:13 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 1/3] qom: Don't keep error value between object_property_parse() calls 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: Thomas Huth , Eduardo Habkost , "Michael S. Tsirkin" , Cornelia Huck , "Dr. David Alan Gilbert" , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" When handling errp=3D=3DNULL at object_apply_global_props(), we are leaving the old error value in `err` after printing a warning. This makes QEMU crash if two global properties generate warnings: $ echo device_add rtl8139 | qemu-system-x86_64 -monitor stdio -global rtl= 8139.xxx=3Dyyy -global rtl8139.xxx=3Dzzz warning: can't apply global rtl8139.xxx=3Dyyy: Property '.xxx' not found qemu-system-x86_64: util/error.c:57: error_setv: Assertion `*errp =3D=3D = NULL' failed. Aborted (core dumped) Fix that by making `err` go out of scope immediately after the warn_report_err() call. Fixes: 50545b2cc029 "qdev-props: call object_apply_global_props()" Signed-off-by: Eduardo Habkost Reviewed-by: Cornelia Huck Reviewed-by: Eric Blake Reviewed-by: Marc-Andr=C3=A9 Lureau --- qom/object.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qom/object.c b/qom/object.c index aa6f3a2a71..4e5226ca12 100644 --- a/qom/object.c +++ b/qom/object.c @@ -372,7 +372,6 @@ static void object_post_init_with_type(Object *obj, Typ= eImpl *ti) =20 void object_apply_global_props(Object *obj, const GPtrArray *props, Error = **errp) { - Error *err =3D NULL; int i; =20 if (!props) { @@ -381,6 +380,7 @@ void object_apply_global_props(Object *obj, const GPtrA= rray *props, Error **errp =20 for (i =3D 0; i < props->len; i++) { GlobalProperty *p =3D g_ptr_array_index(props, i); + Error *err =3D NULL; =20 if (object_dynamic_cast(obj, p->driver) =3D=3D NULL) { continue; --=20 2.18.0.rc1.1.g3f1ff2140 From nobody Tue May 7 03:14:33 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.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 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1547086008424378.36170854263094; Wed, 9 Jan 2019 18:06:48 -0800 (PST) Received: from localhost ([127.0.0.1]:51500 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ghPk7-0000Pv-Ch for importer@patchew.org; Wed, 09 Jan 2019 21:06:47 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35105) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ghPgs-0006Oy-QF for qemu-devel@nongnu.org; Wed, 09 Jan 2019 21:03:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ghPgq-0003KQ-Q1 for qemu-devel@nongnu.org; Wed, 09 Jan 2019 21:03:26 -0500 Received: from mx1.redhat.com ([209.132.183.28]:50874) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ghPgq-0003JX-7L for qemu-devel@nongnu.org; Wed, 09 Jan 2019 21:03:24 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5FB3E81DFA; Thu, 10 Jan 2019 02:03:22 +0000 (UTC) Received: from localhost (ovpn-116-5.gru2.redhat.com [10.97.116.5]) by smtp.corp.redhat.com (Postfix) with ESMTP id AEFEE19742; Thu, 10 Jan 2019 02:03:14 +0000 (UTC) From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Thu, 10 Jan 2019 00:02:58 -0200 Message-Id: <20190110020259.8492-3-ehabkost@redhat.com> In-Reply-To: <20190110020259.8492-1-ehabkost@redhat.com> References: <20190110020259.8492-1-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Thu, 10 Jan 2019 02:03:22 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 2/3] globals: Allow global properties to be optional 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: Thomas Huth , Eduardo Habkost , "Michael S. Tsirkin" , Cornelia Huck , "Dr. David Alan Gilbert" , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Making some global properties optional will let us simplify compat code when a given property works on most (but not all) subclasses of a given type. Device types will be able to opt out from optional compat properties by simply not registering those properties, or by making the property setter report an error. Signed-off-by: Eduardo Habkost --- Note: the "An error is fatal for non-hotplugged devices [...]" comment that appears in the diff scope is inaccurate, but I will fix that in a separate patch because I don't want this to get into the way of fixing the crash. --- include/hw/qdev-core.h | 3 +++ qom/object.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index bc014c1c9f..463e1ddb1e 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -250,6 +250,8 @@ struct PropertyInfo { /** * GlobalProperty: * @used: Set to true if property was used when initializing a device. + * @optional: If set to true, errors when applying the property won't be + * reported by object_apply_global_props(). * * An error is fatal for non-hotplugged devices, when the global is applie= d. */ @@ -258,6 +260,7 @@ typedef struct GlobalProperty { const char *property; const char *value; bool used; + bool optional; } GlobalProperty; =20 static inline void diff --git a/qom/object.c b/qom/object.c index 4e5226ca12..226ddf0189 100644 --- a/qom/object.c +++ b/qom/object.c @@ -387,7 +387,9 @@ void object_apply_global_props(Object *obj, const GPtrA= rray *props, Error **errp } p->used =3D true; object_property_parse(obj, p->value, p->property, &err); - if (err !=3D NULL) { + if (p->optional) { + error_free(err); + } else if (err !=3D NULL) { error_prepend(&err, "can't apply global %s.%s=3D%s: ", p->driver, p->property, p->value); /* --=20 2.18.0.rc1.1.g3f1ff2140 From nobody Tue May 7 03:14:33 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.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 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1547085919898584.8750975862908; Wed, 9 Jan 2019 18:05:19 -0800 (PST) Received: from localhost ([127.0.0.1]:51053 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ghPig-0007nR-9Q for importer@patchew.org; Wed, 09 Jan 2019 21:05:18 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35143) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ghPgy-0006V2-02 for qemu-devel@nongnu.org; Wed, 09 Jan 2019 21:03:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ghPgw-0003OF-OQ for qemu-devel@nongnu.org; Wed, 09 Jan 2019 21:03:31 -0500 Received: from mx1.redhat.com ([209.132.183.28]:33204) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ghPgw-0003Lt-IW for qemu-devel@nongnu.org; Wed, 09 Jan 2019 21:03:30 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8A92158E3D; Thu, 10 Jan 2019 02:03:28 +0000 (UTC) Received: from localhost (ovpn-116-5.gru2.redhat.com [10.97.116.5]) by smtp.corp.redhat.com (Postfix) with ESMTP id BB3A55C54B; Thu, 10 Jan 2019 02:03:23 +0000 (UTC) From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Thu, 10 Jan 2019 00:02:59 -0200 Message-Id: <20190110020259.8492-4-ehabkost@redhat.com> In-Reply-To: <20190110020259.8492-1-ehabkost@redhat.com> References: <20190110020259.8492-1-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 10 Jan 2019 02:03:28 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 3/3] virtio: Make disable-legacy/disable-modern compat properties optional 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: Thomas Huth , Eduardo Habkost , "Michael S. Tsirkin" , Cornelia Huck , "Dr. David Alan Gilbert" , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The disable-legacy and disable-modern properties apply only to some virtio-pci devices. Make those properties optional. This fixes the crash introduced by commit f6e501a28ef9 ("virtio: Provide version-specific variants of virtio PCI devices"): $ qemu-system-x86_64 -machine pc-i440fx-2.6 \ -device virtio-net-pci-non-transitional Unexpected error in object_property_find() at qom/object.c:1092: qemu-system-x86_64: -device virtio-net-pci-non-transitional: can't apply \ global virtio-pci.disable-modern=3Don: Property '.disable-modern' not fou= nd Aborted (core dumped) Reported-by: Thomas Huth Fixes: f6e501a28ef9 ("virtio: Provide version-specific variants of virtio P= CI devices") Signed-off-by: Eduardo Habkost --- hw/core/machine.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/core/machine.c b/hw/core/machine.c index 5530b71981..a19143aa44 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -91,8 +91,9 @@ const size_t hw_compat_2_7_len =3D G_N_ELEMENTS(hw_compat= _2_7); =20 GlobalProperty hw_compat_2_6[] =3D { { "virtio-mmio", "format_transport_address", "off" }, - { "virtio-pci", "disable-modern", "on" }, - { "virtio-pci", "disable-legacy", "off" }, + /* Optional because not all virtio-pci devices support legacy mode */ + { "virtio-pci", "disable-modern", "on", .optional =3D true }, + { "virtio-pci", "disable-legacy", "off", .optional =3D true }, }; const size_t hw_compat_2_6_len =3D G_N_ELEMENTS(hw_compat_2_6); =20 --=20 2.18.0.rc1.1.g3f1ff2140