From nobody Sat May 4 13:57:40 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; 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=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1574881619; cv=none; d=zohomail.com; s=zohoarc; b=O7NzxIW5VjxA1/IDD7AeKsWrrZIfrbrwlgUPkkAV1aVy21ZvHsdE+3CV9IGFoRWKmtq5G+hb++YPU+2bQ/IZpBy35OTIW87ehKtW+TLC9edWFPrxqQgSMJ4dH3rDH6vNLyZuC3JA5AFv7PI6bEIArEiN2m9u1Chu+M+jyz73CWo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1574881619; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=iO5Bt0AWKmUdrDFpOn7BXzQs157G1T0kdl+wOBP3QfM=; b=cIXrls2c8RVuzH5Dv6ksGEcPj3AqSWjJGY698nXgllYVuAkRDnd3IwsigzbRIfyLUjZ+NC6XoQy9PCyCCjfk41FsTk2G4hxyywfKGBGlP4HtaxZu2I4MGGNeOoTbBec/fJGFTu+1l7GwnVWhDh7cKMBsjd5cJvQ32UcsGgoJoKo= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 1574881619673419.8879508197248; Wed, 27 Nov 2019 11:06:59 -0800 (PST) Received: from localhost ([::1]:41986 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ia2eQ-0002IE-0C for importer@patchew.org; Wed, 27 Nov 2019 14:06:58 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56654) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ia2d1-0001FO-AJ for qemu-devel@nongnu.org; Wed, 27 Nov 2019 14:05:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ia2cz-0002tV-Jb for qemu-devel@nongnu.org; Wed, 27 Nov 2019 14:05:30 -0500 Received: from relay.sw.ru ([185.231.240.75]:52834) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ia2cx-0002nY-Hy for qemu-devel@nongnu.org; Wed, 27 Nov 2019 14:05:29 -0500 Received: from vovaso.qa.sw.ru ([10.94.3.0] helo=kvm.qa.sw.ru) by relay.sw.ru with esmtp (Exim 4.92.3) (envelope-from ) id 1ia2cm-0003ZO-OZ; Wed, 27 Nov 2019 22:05:17 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org Subject: [PATCH v6] qdev-monitor: well form error hint helpers Date: Wed, 27 Nov 2019 22:05:16 +0300 Message-Id: <20191127190516.15394-1-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 185.231.240.75 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: pbonzini@redhat.com, vsementsov@virtuozzo.com, berrange@redhat.com, ehabkost@redhat.com, marcandre.lureau@gmail.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Make qbus_list_bus and qbus_list_dev hint append helpers well formed: rename errp to errp_in, as it is IN-parameter here (which is unusual for errp), rename functions to be error_append_*_hint. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Marc-Andr=C3=A9 Lureau --- v6: change functions prefix to qbus_error_append_, to keep qbus_ prefix add r-b by Mark-Andr=C3=A9 qdev-monitor.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/qdev-monitor.c b/qdev-monitor.c index 29ed73e56a..6235898a14 100644 --- a/qdev-monitor.c +++ b/qdev-monitor.c @@ -328,36 +328,36 @@ static Object *qdev_get_peripheral_anon(void) return dev; } =20 -static void qbus_list_bus(DeviceState *dev, Error **errp) +static void qbus_error_append_bus_list_hint(DeviceState *dev, Error **errp= _in) { BusState *child; const char *sep =3D " "; =20 - error_append_hint(errp, "child buses at \"%s\":", + error_append_hint(errp_in, "child buses at \"%s\":", dev->id ? dev->id : object_get_typename(OBJECT(dev))= ); QLIST_FOREACH(child, &dev->child_bus, sibling) { - error_append_hint(errp, "%s\"%s\"", sep, child->name); + error_append_hint(errp_in, "%s\"%s\"", sep, child->name); sep =3D ", "; } - error_append_hint(errp, "\n"); + error_append_hint(errp_in, "\n"); } =20 -static void qbus_list_dev(BusState *bus, Error **errp) +static void qbus_error_append_dev_list_hint(BusState *bus, Error **errp_in) { BusChild *kid; const char *sep =3D " "; =20 - error_append_hint(errp, "devices at \"%s\":", bus->name); + error_append_hint(errp_in, "devices at \"%s\":", bus->name); QTAILQ_FOREACH(kid, &bus->children, sibling) { DeviceState *dev =3D kid->child; - error_append_hint(errp, "%s\"%s\"", sep, + error_append_hint(errp_in, "%s\"%s\"", sep, object_get_typename(OBJECT(dev))); if (dev->id) { - error_append_hint(errp, "/\"%s\"", dev->id); + error_append_hint(errp_in, "/\"%s\"", dev->id); } sep =3D ", "; } - error_append_hint(errp, "\n"); + error_append_hint(errp_in, "\n"); } =20 static BusState *qbus_find_bus(DeviceState *dev, char *elem) @@ -500,7 +500,7 @@ static BusState *qbus_find(const char *path, Error **er= rp) if (!dev) { error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND, "Device '%s' not found", elem); - qbus_list_dev(bus, errp); + qbus_error_append_dev_list_hint(bus, errp); return NULL; } =20 @@ -518,7 +518,7 @@ static BusState *qbus_find(const char *path, Error **er= rp) if (dev->num_child_bus) { error_setg(errp, "Device '%s' has multiple child buses", elem); - qbus_list_bus(dev, errp); + qbus_error_append_bus_list_hint(dev, errp); } else { error_setg(errp, "Device '%s' has no child bus", elem); } @@ -534,7 +534,7 @@ static BusState *qbus_find(const char *path, Error **er= rp) bus =3D qbus_find_bus(dev, elem); if (!bus) { error_setg(errp, "Bus '%s' not found", elem); - qbus_list_bus(dev, errp); + qbus_error_append_bus_list_hint(dev, errp); return NULL; } } --=20 2.21.0