From nobody Fri May 3 02:13:41 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=1574882302; cv=none; d=zohomail.com; s=zohoarc; b=T8+CFHgUyQiFBEdkWUFCvKoQa8snA+9IhFtvOjlA66yC5ykwq0LJlb6Qw9vC1NQNoWnb2QLFyq+mcmiCZlSkdPq67ImZemUo7+A2LiXkVdbv9cC/9Vmr/LqH8zOLFy24ccz7TaVfIm0dgNpmoZyokyaEOgvaQYcQVgaIoEqAtJQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1574882302; h=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=PPMEWhn53+9fiD82k9r1QAB/piumWmDzCbmCjMxBtzI=; b=EHNZ2R0vIIQ0BzNzUbuf+vUrh2fA9pQMP0I4671WOoVO4NhJjrc9GQo5Oe63BZJXFi2qzDY+3r2qpihS3TSdf+prwZdI29MFGNoD5m0V85c/C3X20i5Ez9FrnBo+PgnJdE6LOqLRJ/v9xQz8a2JD7o5MS/mkDRr5V0pns6q0FoQ= 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 1574882302863776.059847357784; Wed, 27 Nov 2019 11:18:22 -0800 (PST) Received: from localhost ([::1]:42102 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ia2pR-0001Rm-Fw for importer@patchew.org; Wed, 27 Nov 2019 14:18:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33641) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ia2n6-0008Q6-KK for qemu-devel@nongnu.org; Wed, 27 Nov 2019 14:15:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ia2n4-0004OK-6k for qemu-devel@nongnu.org; Wed, 27 Nov 2019 14:15:55 -0500 Received: from relay.sw.ru ([185.231.240.75]:53328) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ia2n3-0004Lw-9w for qemu-devel@nongnu.org; Wed, 27 Nov 2019 14:15:54 -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 1ia2mz-0003f3-85; Wed, 27 Nov 2019 22:15:49 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org Subject: [PATCH v6] 9pfs: well form error hint helpers Date: Wed, 27 Nov 2019 22:15:49 +0300 Message-Id: <20191127191549.21216-1-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 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: vsementsov@virtuozzo.com, groug@kaod.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Make error_append_security_model_hint and error_append_socket_sockfd_hint hint append helpers well formed: rename errp to errp_in, as it is IN-parameter here (which is unusual for errp). Signed-off-by: Vladimir Sementsov-Ogievskiy Acked-by: Greg Kurz --- v6: add Greg's a-b hw/9pfs/9p-local.c | 4 ++-- hw/9pfs/9p-proxy.c | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/hw/9pfs/9p-local.c b/hw/9pfs/9p-local.c index 4708c0bd89..76fa1858b7 100644 --- a/hw/9pfs/9p-local.c +++ b/hw/9pfs/9p-local.c @@ -1473,9 +1473,9 @@ static void local_cleanup(FsContext *ctx) g_free(data); } =20 -static void error_append_security_model_hint(Error **errp) +static void error_append_security_model_hint(Error **errp_in) { - error_append_hint(errp, "Valid options are: security_model=3D" + error_append_hint(errp_in, "Valid options are: security_model=3D" "[passthrough|mapped-xattr|mapped-file|none]\n"); } =20 diff --git a/hw/9pfs/9p-proxy.c b/hw/9pfs/9p-proxy.c index 97ab9c58a5..9e29abc3ef 100644 --- a/hw/9pfs/9p-proxy.c +++ b/hw/9pfs/9p-proxy.c @@ -1114,9 +1114,10 @@ static int connect_namedsocket(const char *path, Err= or **errp) return sockfd; } =20 -static void error_append_socket_sockfd_hint(Error **errp) +static void error_append_socket_sockfd_hint(Error **errp_in) { - error_append_hint(errp, "Either specify socket=3D/some/path where /som= e/path" + error_append_hint(errp_in, + "Either specify socket=3D/some/path where /some/path" " points to a listening AF_UNIX socket or sock_fd=3D= fd" " where fd is a file descriptor to a connected AF_UN= IX" " socket\n"); --=20 2.21.0