From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.4 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BB60BFC6196 for ; Fri, 8 Nov 2019 20:50:36 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 863432085B for ; Fri, 8 Nov 2019 20:50:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="rKNwbMui" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 863432085B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:60202 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iTBDH-00026v-Lj for qemu-devel@archiver.kernel.org; Fri, 08 Nov 2019 15:50:35 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50142) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iTBCB-0001Fq-OM for qemu-devel@nongnu.org; Fri, 08 Nov 2019 15:49:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iTBC9-0008Da-Il for qemu-devel@nongnu.org; Fri, 08 Nov 2019 15:49:27 -0500 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:40167) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iTBC5-0008Ae-QX for qemu-devel@nongnu.org; Fri, 08 Nov 2019 15:49:23 -0500 Received: by mail-wm1-x343.google.com with SMTP id f3so7535195wmc.5 for ; Fri, 08 Nov 2019 12:49:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=Fn7mxwF8TtzvsgyURQwBP/xIWdiI+ujSn/Mb4sCAX3c=; b=rKNwbMuiFud3OHHmXfgTy4fHGM4pIb9VORLIPv0cPXKFetq1e6/a0JH2oW7Kv9bexb RaWxYJ2XoPW+3DqfW5fVQdaSG19AIdwGwnGmIHIqTImWxMc/UH/2RGiA3Xl8FC/+smSc fPuGbjfRMyctnOuS5CORJkPkyLZQRcMi7saB1fcVAyncVyrHU8mftpWYt8Eum/x87x3B /APASFuVE8f3DS+CmaQmPiXoi1YRfB0a6NWYdhdjmnl6R5TeEXfdGT2YIupvYuvEX8PT 8LURE7oUzyM+8XDqtxBVGBkZHxGVl3GshaRnqhfXgmULLzitEeSWkdrRkVfPaPVxAhBK JVOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=Fn7mxwF8TtzvsgyURQwBP/xIWdiI+ujSn/Mb4sCAX3c=; b=Nzg6OWG7TlnsUHG2c7KJcPm/kqojGQ/Td0EeHwwz/oiv0TeqvRh74Oa1spRIq85maW FEwspnntFu3etoHP0drddRqmt6qH2lw3snQGrclHl9rvoj/AEEYe8rs/ZgGOdOTPzn05 mvxKstEjYA9VUNsJ8CIPc15tiXXRHmh7Yn2R6vPQ+j8TstN7Ect4yEuOtRpW13x/qXN3 qe2/3QbSEkP0Bwlvxi/ujOyS7c0OYS5OwrJvJoNK9R0jOVuMFvI6dzdZObi57ajGueJY Kl5oNwebxXto7PQfmSEklCGghLBM1Uf5SjF3n5BtP+RLk9SKo1+hqQEq9YdahKkHkvw7 Cykg== X-Gm-Message-State: APjAAAUhslux2uYf/rynf7bHchje9kkmnv2WIbVu01TwJILk1PfrjOIL A/ehPOLm2S0f4lGP3QIaQo6Fpgk7oLaU2lb8sqg= X-Google-Smtp-Source: APXvYqyoOi9H0m5RKL/AZIoyaNZrisTrR33Do8CtFZzs17hooqviFPLV+0KOXJYcWSYI7MrTmEl2VC20U4/r0sAscE4= X-Received: by 2002:a1c:9e10:: with SMTP id h16mr4927377wme.91.1573246158588; Fri, 08 Nov 2019 12:49:18 -0800 (PST) MIME-Version: 1.0 References: <20191011160552.22907-1-vsementsov@virtuozzo.com> <20191011160552.22907-7-vsementsov@virtuozzo.com> In-Reply-To: <20191011160552.22907-7-vsementsov@virtuozzo.com> From: =?UTF-8?B?TWFyYy1BbmRyw6kgTHVyZWF1?= Date: Sat, 9 Nov 2019 00:49:05 +0400 Message-ID: Subject: Re: [RFC v5 006/126] qdev-monitor: well form error hint helpers To: Vladimir Sementsov-Ogievskiy Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::343 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: Paolo Bonzini , =?UTF-8?Q?Daniel_P=2E_Berrang=C3=A9?= , QEMU , Eduardo Habkost , Markus Armbruster Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Hi On Fri, Oct 11, 2019 at 8:11 PM Vladimir Sementsov-Ogievskiy wrote: > > 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 > --- > qdev-monitor.c | 24 ++++++++++++------------ > 1 file changed, 12 insertions(+), 12 deletions(-) > > diff --git a/qdev-monitor.c b/qdev-monitor.c > index 85b58620d1..d14ef6af01 100644 > --- a/qdev-monitor.c > +++ b/qdev-monitor.c > @@ -326,36 +326,36 @@ static Object *qdev_get_peripheral_anon(void) > return dev; > } > > -static void qbus_list_bus(DeviceState *dev, Error **errp) > +static void error_append_qbus_bus_list_hint(DeviceState *dev, Error **er= rp_in) Please keep the qbus_ prefix > { > BusState *child; > const char *sep =3D " "; > > - 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"); > } > > -static void qbus_list_dev(BusState *bus, Error **errp) > +static void error_append_qbus_dev_list_hint(BusState *bus, Error **errp_= in) here too > { > BusChild *kid; > const char *sep =3D " "; > > - 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"); > } > > static BusState *qbus_find_bus(DeviceState *dev, char *elem) > @@ -498,7 +498,7 @@ static BusState *qbus_find(const char *path, Error **= errp) > if (!dev) { > error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND, > "Device '%s' not found", elem); > - qbus_list_dev(bus, errp); > + error_append_qbus_dev_list_hint(bus, errp); > return NULL; > } > > @@ -516,7 +516,7 @@ static BusState *qbus_find(const char *path, Error **= errp) > if (dev->num_child_bus) { > error_setg(errp, "Device '%s' has multiple child buses", > elem); > - qbus_list_bus(dev, errp); > + error_append_qbus_bus_list_hint(dev, errp); > } else { > error_setg(errp, "Device '%s' has no child bus", elem); > } > @@ -532,7 +532,7 @@ static BusState *qbus_find(const char *path, Error **= errp) > bus =3D qbus_find_bus(dev, elem); > if (!bus) { > error_setg(errp, "Bus '%s' not found", elem); > - qbus_list_bus(dev, errp); > + error_append_qbus_bus_list_hint(dev, errp); > return NULL; > } > } > -- > 2.21.0 > > other than that: Reviewed-by: Marc-Andr=C3=A9 Lureau --=20 Marc-Andr=C3=A9 Lureau