From nobody Sat Nov 1 22:49:27 2025 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 1527071609840376.6002143760494; Wed, 23 May 2018 03:33:29 -0700 (PDT) Received: from localhost ([::1]:60459 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fLR5B-0005Bb-3g for importer@patchew.org; Wed, 23 May 2018 06:33:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35965) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fLQxQ-000848-5A for qemu-devel@nongnu.org; Wed, 23 May 2018 06:25:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fLQxK-0003tU-3H for qemu-devel@nongnu.org; Wed, 23 May 2018 06:25:23 -0400 Received: from relay.sw.ru ([185.231.240.75]:43750) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fLQwv-0003bK-IN; Wed, 23 May 2018 06:24:53 -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 1fLQwi-0006Rs-Sb; Wed, 23 May 2018 13:24:40 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org, qemu-devel@nongnu.org Date: Wed, 23 May 2018 13:24:16 +0300 Message-Id: <20180523102419.28665-3-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.11.1 In-Reply-To: <20180523102419.28665-1-vsementsov@virtuozzo.com> References: <20180523102419.28665-1-vsementsov@virtuozzo.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 185.231.240.75 Subject: [Qemu-devel] [PATCH v3 2/5] nbd/server: add nbd_meta_empty_or_pattern helper 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" Add nbd_meta_pattern() and nbd_meta_empty_or_pattern() helpers for metadata query parsing. nbd_meta_pattern() will be reused for "qemu" namespace in following patches. Signed-off-by: Vladimir Sementsov-Ogievskiy --- nbd/server.c | 82 ++++++++++++++++++++++++++++++++++++++++++--------------= ---- 1 file changed, 57 insertions(+), 25 deletions(-) diff --git a/nbd/server.c b/nbd/server.c index 7584ff7dcc..8869dfe1f9 100644 --- a/nbd/server.c +++ b/nbd/server.c @@ -734,48 +734,79 @@ static int nbd_negotiate_send_meta_context(NBDClient = *client, return qio_channel_writev_all(client->ioc, iov, 2, errp) < 0 ? -EIO : = 0; } =20 -/* nbd_meta_base_query - * - * Handle query to 'base' namespace. For now, only base:allocation context= is - * available in it. 'len' is the amount of text remaining to be read from - * the current name, after the 'base:' portion has been stripped. +/* Read strlen(@pattern) bytes, and set @match to true if they match @patt= ern. + * @match is never set to false. * * Return -errno on I/O error, 0 if option was completely handled by * 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) + * Note: return code =3D 1 doesn't mean that we've read exactly @pattern + * It only means that there are no errors. */ +static int nbd_meta_pattern(NBDClient *client, const char *pattern, bool *= match, + Error **errp) { int ret; - char query[sizeof("allocation") - 1]; - size_t alen =3D strlen("allocation"); + char *query; + int len =3D strlen(pattern); + + assert(len); + + query =3D g_malloc(len); + ret =3D nbd_opt_read(client, query, len, errp); + if (ret <=3D 0) { + g_free(query); + return ret; + } + + if (strncmp(query, pattern, len) =3D=3D 0) { + trace_nbd_negotiate_meta_query_parse(pattern); + *match =3D true; + } + g_free(query); =20 + return 1; +} + +/* Read @len bytes, and set @match to true if they match @pattern, or if @= len + * is 0 and the client is performing _LIST_. @match is never set to false. + * + * Return -errno on I/O error, 0 if option was completely handled by + * sending a reply about inconsistent lengths, or 1 on success. + * + * Note: return code =3D 1 doesn't mean that we've read exactly @pattern + * It only means that there are no errors. */ +static int nbd_meta_empty_or_pattern(NBDClient *client, const char *patter= n, + uint32_t len, bool *match, Error **er= rp) +{ if (len =3D=3D 0) { if (client->opt =3D=3D NBD_OPT_LIST_META_CONTEXT) { - meta->base_allocation =3D true; + *match =3D true; } - trace_nbd_negotiate_meta_query_parse("base:"); + trace_nbd_negotiate_meta_query_parse("empty"); return 1; } =20 - if (len !=3D alen) { - trace_nbd_negotiate_meta_query_skip("not base:allocation"); + if (len !=3D strlen(pattern)) { + trace_nbd_negotiate_meta_query_skip("different lengths"); return nbd_opt_skip(client, len, errp); } =20 - ret =3D nbd_opt_read(client, query, len, errp); - if (ret <=3D 0) { - return ret; - } - - if (strncmp(query, "allocation", alen) =3D=3D 0) { - trace_nbd_negotiate_meta_query_parse("base:allocation"); - meta->base_allocation =3D true; - } + return nbd_meta_pattern(client, pattern, match, errp); +} =20 - return 1; +/* nbd_meta_base_query + * + * Handle query to 'base' namespace. For now, only base:allocation context= is + * available in it. 'len' is the amount of text remaining to be read from + * 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. */ +static int nbd_meta_base_query(NBDClient *client, NBDExportMetaContexts *m= eta, + uint32_t len, Error **errp) +{ + return nbd_meta_empty_or_pattern(client, "allocation", len, + &meta->base_allocation, errp); } =20 /* nbd_negotiate_meta_query @@ -821,6 +852,7 @@ static int nbd_negotiate_meta_query(NBDClient *client, return nbd_opt_skip(client, len, errp); } =20 + trace_nbd_negotiate_meta_query_parse("base:"); return nbd_meta_base_query(client, meta, len, errp); } =20 --=20 2.11.1