From nobody Wed Oct 23 00:33:50 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=yandex-team.ru ARC-Seal: i=1; a=rsa-sha256; t=1726825897; cv=none; d=zohomail.com; s=zohoarc; b=brRoqJCjYosnYVpH123staHg60D+TIwOEy7oFEhrWo7IyT2r8/TQHKwtHj6qMd1+gzayycqvyZfYitV8ufaqdbyXfqOaNLsWAOXaA4Q2xKSyFEEtMkPTeN/Ab9jbJXygZQB7/DZJwIQc+XI5LJLGNilBaanpb8Rs1hnbtX249Gs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1726825897; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=AmZ43T8iNI/ABaXS7mCZR9psl2c/9HCptRm4qNA6b3A=; b=GcBeP4Uh/H0++pucdDDckcUWlR9HRFlZiRtoBhUlfqlB8FFyG05Djg6ZuX2gD3lfDRcOy+yrAvhGD7c3CVqqhPzvv4G07ZtuHc3fVR9/P8tzKfR6z8w3fcYOZP08fBR5+A86ViP+YgnP7GoHeuMlZcLAz0PbNKrYW3sp4heV8rw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1726825897618823.1271394526019; Fri, 20 Sep 2024 02:51:37 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sraI1-0007bg-VO; Fri, 20 Sep 2024 05:51:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sraHx-0007OF-1q; Fri, 20 Sep 2024 05:50:57 -0400 Received: from forwardcorp1d.mail.yandex.net ([178.154.239.200]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sraHr-0000w2-Bz; Fri, 20 Sep 2024 05:50:56 -0400 Received: from mail-nwsmtp-smtp-corp-main-80.iva.yp-c.yandex.net (mail-nwsmtp-smtp-corp-main-80.iva.yp-c.yandex.net [IPv6:2a02:6b8:c0c:1a13:0:640:f32:0]) by forwardcorp1d.mail.yandex.net (Yandex) with ESMTPS id 4948F60A82; Fri, 20 Sep 2024 12:50:46 +0300 (MSK) Received: from vsementsov-lin.. (unknown [2a02:6b8:b081:b599::1:1f]) by mail-nwsmtp-smtp-corp-main-80.iva.yp-c.yandex.net (smtpcorp/Yandex) with ESMTPSA id LoLjH00IlKo0-RisFyUE2; Fri, 20 Sep 2024 12:50:45 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1726825845; bh=AmZ43T8iNI/ABaXS7mCZR9psl2c/9HCptRm4qNA6b3A=; h=Message-Id:Date:In-Reply-To:Cc:Subject:References:To:From; b=XrAQwcd4PO7gBj/CsrncrymI0rHozl63uT8LX6fGtjdwmF1sDZH8J4SHhaR7oKNYz m1ms1ZoFKm7N0Fm6RvxAo30W3vGCDutOoQ6sU98EWesB18Di2t7HNZhXVFzWenLgo9 VHrfKH+pd0wgBiVWH5hoqUAYZTUBSftrVJWRWKK8= Authentication-Results: mail-nwsmtp-smtp-corp-main-80.iva.yp-c.yandex.net; dkim=pass header.i=@yandex-team.ru From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org, raphael@enfabrica.net, mst@redhat.com Cc: sgarzare@redhat.com, kwolf@redhat.com, hreitz@redhat.com, pbonzini@redhat.com, berrange@redhat.com, eduardo@habkost.net, eblake@redhat.com, armbru@redhat.com, qemu-devel@nongnu.org, vsementsov@yandex-team.ru Subject: [PATCH v6 1/3] qdev-monitor: add option to report GenericError from find_device_state Date: Fri, 20 Sep 2024 12:49:34 +0300 Message-Id: <20240920094936.450987-2-vsementsov@yandex-team.ru> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240920094936.450987-1-vsementsov@yandex-team.ru> References: <20240920094936.450987-1-vsementsov@yandex-team.ru> MIME-Version: 1.0 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=178.154.239.200; envelope-from=vsementsov@yandex-team.ru; helo=forwardcorp1d.mail.yandex.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @yandex-team.ru) X-ZM-MESSAGEID: 1726825898882116600 Content-Type: text/plain; charset="utf-8" Here we just prepare for the following patch, making possible to report GenericError as recommended. This patch doesn't aim to prevent further use of DeviceNotFound by future interfaces: - find_device_state() is used in blk_by_qdev_id() and qmp_get_blk() functions, which may lead to spread of DeviceNotFound anyway - also, nothing prevent simply copy-pasting find_device_state() calls with false argument Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Markus Armbruster Acked-by: Raphael Norwitz --- system/qdev-monitor.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/system/qdev-monitor.c b/system/qdev-monitor.c index 44994ea0e1..6671137a91 100644 --- a/system/qdev-monitor.c +++ b/system/qdev-monitor.c @@ -885,13 +885,20 @@ void qmp_device_add(QDict *qdict, QObject **ret_data,= Error **errp) object_unref(OBJECT(dev)); } =20 -static DeviceState *find_device_state(const char *id, Error **errp) +/* + * Note that creating new APIs using error classes other than GenericError= is + * not recommended. Set use_generic_error=3Dtrue for new interfaces. + */ +static DeviceState *find_device_state(const char *id, bool use_generic_err= or, + Error **errp) { Object *obj =3D object_resolve_path_at(qdev_get_peripheral(), id); DeviceState *dev; =20 if (!obj) { - error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND, + error_set(errp, + (use_generic_error ? + ERROR_CLASS_GENERIC_ERROR : ERROR_CLASS_DEVICE_NOT_FOUN= D), "Device '%s' not found", id); return NULL; } @@ -956,7 +963,7 @@ void qdev_unplug(DeviceState *dev, Error **errp) =20 void qmp_device_del(const char *id, Error **errp) { - DeviceState *dev =3D find_device_state(id, errp); + DeviceState *dev =3D find_device_state(id, false, errp); if (dev !=3D NULL) { if (dev->pending_deleted_event && (dev->pending_deleted_expires_ms =3D=3D 0 || @@ -1076,7 +1083,7 @@ BlockBackend *blk_by_qdev_id(const char *id, Error **= errp) =20 GLOBAL_STATE_CODE(); =20 - dev =3D find_device_state(id, errp); + dev =3D find_device_state(id, false, errp); if (dev =3D=3D NULL) { return NULL; } --=20 2.34.1