From nobody Tue Feb 10 19:14:25 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=virtuozzo.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 152855774078663.26458660800188; Sat, 9 Jun 2018 08:22:20 -0700 (PDT) Received: from localhost ([::1]:40646 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fRfh6-0005k4-3a for importer@patchew.org; Sat, 09 Jun 2018 11:22:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36196) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fRfd0-0002y3-JW for qemu-devel@nongnu.org; Sat, 09 Jun 2018 11:18:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fRfcx-00051z-EH for qemu-devel@nongnu.org; Sat, 09 Jun 2018 11:18:06 -0400 Received: from relay.sw.ru ([195.214.232.25]:51892) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fRfcx-00050X-5R for qemu-devel@nongnu.org; Sat, 09 Jun 2018 11:18:03 -0400 Received: from msk-vpn.virtuozzo.com ([195.214.232.6] helo=kvm.sw.ru) by relay.sw.ru with esmtp (Exim 4.90_1) (envelope-from ) id 1fRfct-0006t9-HI; Sat, 09 Jun 2018 18:17:59 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org, qemu-devel@nongnu.org Date: Sat, 9 Jun 2018 18:17:53 +0300 Message-Id: <20180609151758.17343-2-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.11.1 In-Reply-To: <20180609151758.17343-1-vsementsov@virtuozzo.com> References: <20180609151758.17343-1-vsementsov@virtuozzo.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 195.214.232.25 Subject: [Qemu-devel] [PATCH v5 1/6] nbd/server: fix trace X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, vsementsov@virtuozzo.com, armbru@redhat.com, mreitz@redhat.com, den@openvz.org, pbonzini@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Return code =3D 1 doesn't mean that we parsed base:allocation. Use correct traces in both -parsed and -skipped cases. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake --- nbd/server.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/nbd/server.c b/nbd/server.c index 9e1f227178..8e02e077ec 100644 --- a/nbd/server.c +++ b/nbd/server.c @@ -741,7 +741,10 @@ static int nbd_negotiate_send_meta_context(NBDClient *= client, * the current name, after the 'base:' portion has been stripped. * * Return -errno on I/O error, 0 if option was completely handled by - * sending a reply about inconsistent lengths, or 1 on success. */ + * sending a reply about inconsistent lengths, or 1 on success. + * + * Note: return code =3D 1 doesn't mean that we've parsed "base:allocation" + * namespace. It only means that there are no errors.*/ static int nbd_meta_base_query(NBDClient *client, NBDExportMetaContexts *m= eta, uint32_t len, Error **errp) { @@ -768,10 +771,12 @@ static int nbd_meta_base_query(NBDClient *client, NBD= ExportMetaContexts *meta, } =20 if (strncmp(query, "allocation", alen) =3D=3D 0) { + trace_nbd_negotiate_meta_query_parse("base:allocation"); meta->base_allocation =3D true; + } else { + trace_nbd_negotiate_meta_query_skip("not base:allocation"); } =20 - trace_nbd_negotiate_meta_query_parse("base:allocation"); return 1; } =20 --=20 2.11.1