From nobody Tue Feb 10 01:35:38 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 ARC-Seal: i=1; a=rsa-sha256; t=1592819255; cv=none; d=zohomail.com; s=zohoarc; b=np76Kk1dbcKEWoJWv0WwI3tRZUZ0QO/qvkawcE9eTSWgxTJmjWrnED7g5ACsKEif2zRxJzGUVjN6SmV74D5TxtuEs6UUaazysCXVSc6t/CgOYOg9DNVZCd4AbMj3AnqwOzmQQ9YfzXyrXd/5AvqSjPpPj9VA/IyzvJXjRzeESfM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592819255; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=RUHJwPWCe2tvoP+H6+xUiXRwWmUIzR8hNTogSta+uJ4=; b=ipPrnpfGP0W79tsxHG1s9iqc+94o3hV0qQ/pO+tikd8xQdZ0/dQW3ImjFA1bm5Yju1hHfykWFN0r9f8CQAbdsqp5rjAVIuw0uHrSh1i+bE0El/8ZA4vULGCb/pguIiNCGdXjXuEOrLioW1MyVGCgWyPu9JUpZtIoFghJBVFLKyg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1592819255857118.48340506345812; Mon, 22 Jun 2020 02:47:35 -0700 (PDT) Received: from localhost ([::1]:58882 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jnJ38-0002fw-EH for importer@patchew.org; Mon, 22 Jun 2020 05:47:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53848) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jnIyM-0001Yc-E7 for qemu-devel@nongnu.org; Mon, 22 Jun 2020 05:42:38 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:47439 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jnIyI-0003v9-KI for qemu-devel@nongnu.org; Mon, 22 Jun 2020 05:42:38 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-108-XiXzyxaVOJic9W0HcLJHuw-1; Mon, 22 Jun 2020 05:42:32 -0400 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7B3CA184D147; Mon, 22 Jun 2020 09:42:31 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-121.ams2.redhat.com [10.36.112.121]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1C5CB1C94D; Mon, 22 Jun 2020 09:42:31 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id EDBA71138478; Mon, 22 Jun 2020 11:42:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592818954; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RUHJwPWCe2tvoP+H6+xUiXRwWmUIzR8hNTogSta+uJ4=; b=U/j6jPafYJM/6FisiEFk5WLpDpzV3ILRomPseq0aq1pyWbdyf1er1rvv9vmjLXCxX1eCQf WIUtp7lltRbxni+JB7YZs8ei2YPPIimlzV3SZoi8X3VLLqAnUDF+mR8XOuDA+sGpgs7g0Q v+30OR/LiwdoR3Hik3ea+5ZcY530ebw= X-MC-Unique: XiXzyxaVOJic9W0HcLJHuw-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH v2 10/16] qdev: Improve netdev property override error a bit Date: Mon, 22 Jun 2020 11:42:21 +0200 Message-Id: <20200622094227.1271650-11-armbru@redhat.com> In-Reply-To: <20200622094227.1271650-1-armbru@redhat.com> References: <20200622094227.1271650-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=205.139.110.120; envelope-from=armbru@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/22 01:27:42 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, berrange@redhat.com, ehabkost@redhat.com, qemu-block@nongnu.org, Jason Wang , mreitz@redhat.com, pbonzini@redhat.com, jsnow@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" qdev_prop_set_netdev() fails when the property already has a non-null value. Seems to go back to commit 30c367ed44 "qdev-properties-system.c: Allow vlan or netdev for -device, not both", v1.7.0. Board code doesn't expect failure, and crashes: $ qemu-system-x86_64 --nodefaults -nic user -netdev user,id=3Dnic0 -glo= bal e1000.netdev=3Dnic0 Unexpected error in error_set_from_qdev_prop_error() at /work/armbru/qe= mu/hw/core/qdev-properties.c:1101: qemu-system-x86_64: Property 'e1000.netdev' doesn't take value '__org.q= emu.nic0 ' Aborted (core dumped) -device and device_add handle the failure: $ qemu-system-x86_64 -nodefaults -netdev user,id=3Dnet0 -netdev user,id= =3Dnet1 -device e1000,netdev=3Dnet0,netdev=3Dnet1 qemu-system-x86_64: -device e1000,netdev=3Dnet0,netdev=3Dnet1: Property= 'e1000.netdev' doesn't take value 'net1' $ qemu-system-x86_64 -nodefaults -S -display none -monitor stdio -netde= v user,id=3Dnet0 -netdev user,id=3Dnet1 -global e1000.netdev=3Dnet0 QEMU 5.0.50 monitor - type 'help' for more information (qemu) qemu-system-x86_64: warning: netdev net0 has no peer qemu-system-x86_64: warning: netdev net1 has no peer device_add e1000,netdev=3Dnet1 Error: Property 'e1000.netdev' doesn't take value 'net1' Perhaps netdev property override could be made to work. Perhaps it should. I'm not the right guy to figure this out. What I can do is improve the error message a bit: (qemu) device_add e1000,netdev=3Dnet1 Error: -global e1000.netdev=3D... conflicts with netdev=3Dnet1 Cc: Jason Wang Signed-off-by: Markus Armbruster --- include/hw/qdev-properties.h | 2 ++ hw/core/qdev-properties-system.c | 30 +++++++++++++++++++++++++++--- hw/core/qdev-properties.c | 17 +++++++++++++++++ 3 files changed, 46 insertions(+), 3 deletions(-) diff --git a/include/hw/qdev-properties.h b/include/hw/qdev-properties.h index 5252bb6b1a..fc0b2f6b45 100644 --- a/include/hw/qdev-properties.h +++ b/include/hw/qdev-properties.h @@ -251,6 +251,8 @@ void qdev_prop_set_macaddr(DeviceState *dev, const char= *name, void qdev_prop_set_enum(DeviceState *dev, const char *name, int value); =20 void qdev_prop_register_global(GlobalProperty *prop); +const GlobalProperty *qdev_find_global_prop(DeviceState *dev, + const char *name); int qdev_prop_check_globals(void); void qdev_prop_set_globals(DeviceState *dev); void error_set_from_qdev_prop_error(Error **errp, int ret, DeviceState *de= v, diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-sys= tem.c index 9aa80495ee..3f84309b7e 100644 --- a/hw/core/qdev-properties-system.c +++ b/hw/core/qdev-properties-system.c @@ -25,6 +25,28 @@ #include "sysemu/iothread.h" #include "sysemu/tpm_backend.h" =20 +static bool check_prop_still_unset(DeviceState *dev, const char *name, + const void *old_val, const char *new_va= l, + Error **errp) +{ + const GlobalProperty *prop =3D qdev_find_global_prop(dev, name); + + if (!old_val) { + return true; + } + + if (prop) { + error_setg(errp, "-global %s.%s=3D... conflicts with %s=3D%s", + prop->driver, prop->property, name, new_val); + } else { + /* Error message is vague, but a better one would be hard */ + error_setg(errp, "%s=3D%s conflicts, and override is not implement= ed", + name, new_val); + } + return false; +} + + /* --- drive --- */ =20 static void get_drive(Object *obj, Visitor *v, const char *name, void *opa= que, @@ -299,14 +321,16 @@ static void set_netdev(Object *obj, Visitor *v, const= char *name, } =20 for (i =3D 0; i < queues; i++) { - if (peers[i]->peer) { err =3D -EEXIST; goto out; } =20 - if (ncs[i]) { - err =3D -EINVAL; + /* + * TODO Should this really be an error? If no, the old value + * needs to be released before we store the new one. + */ + if (!check_prop_still_unset(dev, name, ncs[i], str, errp)) { goto out; } =20 diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c index ead35d7ffd..71f8aca7c6 100644 --- a/hw/core/qdev-properties.c +++ b/hw/core/qdev-properties.c @@ -1246,6 +1246,23 @@ void qdev_prop_register_global(GlobalProperty *prop) g_ptr_array_add(global_props(), prop); } =20 +const GlobalProperty *qdev_find_global_prop(DeviceState *dev, + const char *name) +{ + GPtrArray *props =3D global_props(); + const GlobalProperty *p; + int i; + + for (i =3D 0; i < props->len; i++) { + p =3D g_ptr_array_index(props, i); + if (object_dynamic_cast(OBJECT(dev), p->driver) + && !strcmp(p->property, name)) { + return p; + } + } + return NULL; +} + int qdev_prop_check_globals(void) { int i, ret =3D 0; --=20 2.26.2