From nobody Sun Oct 5 21:16:22 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=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1544882802217974.7816499961687; Sat, 15 Dec 2018 06:06:42 -0800 (PST) Received: from localhost ([::1]:39191 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gYAaX-0006lG-1Z for importer@patchew.org; Sat, 15 Dec 2018 09:06:41 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34530) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gYAOJ-0004vL-DW for qemu-devel@nongnu.org; Sat, 15 Dec 2018 08:54:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gYAOG-0008Fp-W1 for qemu-devel@nongnu.org; Sat, 15 Dec 2018 08:54:03 -0500 Received: from mx1.redhat.com ([209.132.183.28]:36528) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gYAOE-0008D2-87; Sat, 15 Dec 2018 08:53:58 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8933FC049599; Sat, 15 Dec 2018 13:53:57 +0000 (UTC) Received: from red.redhat.com (ovpn-122-76.rdu2.redhat.com [10.10.122.76]) by smtp.corp.redhat.com (Postfix) with ESMTP id 548BC5C1B2; Sat, 15 Dec 2018 13:53:56 +0000 (UTC) From: Eric Blake To: qemu-devel@nongnu.org Date: Sat, 15 Dec 2018 07:53:15 -0600 Message-Id: <20181215135324.152629-14-eblake@redhat.com> In-Reply-To: <20181215135324.152629-1-eblake@redhat.com> References: <20181215135324.152629-1-eblake@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Sat, 15 Dec 2018 13:53:57 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 13/22] nbd/client: Split out nbd_send_one_meta_context() 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: nsoffer@redhat.com, vsementsov@virtuozzo.com, jsnow@redhat.com, rjones@redhat.com, qemu-block@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Refactor nbd_negotiate_simple_meta_context() to pull out the code that can be reused to send a LIST request for 0 or 1 query. No semantic change. Signed-off-by: Eric Blake Reviewed-by: Richard W.M. Jones --- v2: split patch into easier-to-review pieces [Rich, Vladimir] --- nbd/client.c | 64 ++++++++++++++++++++++++++++++++++-------------- nbd/trace-events | 2 +- 2 files changed, 46 insertions(+), 20 deletions(-) diff --git a/nbd/client.c b/nbd/client.c index b6a85fc3ef8..5b6b9964097 100644 --- a/nbd/client.c +++ b/nbd/client.c @@ -627,6 +627,48 @@ static QIOChannel *nbd_receive_starttls(QIOChannel *io= c, return QIO_CHANNEL(tioc); } +/* nbd_send_one_meta_context: + * Send 0 or 1 set/list meta context queries. + * return 0 on success, -1 with errp set for any error + */ +static int nbd_send_one_meta_context(QIOChannel *ioc, + uint32_t opt, + const char *export, + const char *query, + Error **errp) +{ + int ret; + uint32_t export_len =3D strlen(export); + uint32_t queries =3D !!query; + uint32_t context_len =3D 0; + uint32_t data_len; + char *data; + char *p; + + data_len =3D sizeof(export_len) + export_len + sizeof(queries); + if (query) { + context_len =3D strlen(query); + data_len +=3D sizeof(context_len) + context_len; + } else { + assert(opt =3D=3D NBD_OPT_LIST_META_CONTEXT); + } + data =3D g_malloc(data_len); + p =3D data; + + trace_nbd_opt_meta_request(nbd_opt_lookup(opt), query ?: "(all)", expo= rt); + stl_be_p(p, export_len); + memcpy(p +=3D sizeof(export_len), export, export_len); + stl_be_p(p +=3D export_len, queries); + if (query) { + stl_be_p(p +=3D sizeof(uint32_t), context_len); + memcpy(p +=3D sizeof(context_len), query, context_len); + } + + ret =3D nbd_send_option_request(ioc, opt, data_len, data, errp); + g_free(data); + return ret; +} + /* nbd_negotiate_simple_meta_context: * Request the server to set the meta context for export @info->name * using @info->x_dirty_bitmap with a fallback to "base:allocation", @@ -651,26 +693,10 @@ static int nbd_negotiate_simple_meta_context(QIOChann= el *ioc, NBDOptionReply reply; const char *context =3D info->x_dirty_bitmap ?: "base:allocation"; bool received =3D false; - uint32_t export_len =3D strlen(info->name); - uint32_t context_len =3D strlen(context); - uint32_t data_len =3D sizeof(export_len) + export_len + - sizeof(uint32_t) + /* number of queries */ - sizeof(context_len) + context_len; - char *data =3D g_malloc(data_len); - char *p =3D data; - trace_nbd_opt_meta_request(context, info->name); - stl_be_p(p, export_len); - memcpy(p +=3D sizeof(export_len), info->name, export_len); - stl_be_p(p +=3D export_len, 1); - stl_be_p(p +=3D sizeof(uint32_t), context_len); - memcpy(p +=3D sizeof(context_len), context, context_len); - - ret =3D nbd_send_option_request(ioc, NBD_OPT_SET_META_CONTEXT, data_le= n, data, - errp); - g_free(data); - if (ret < 0) { - return ret; + if (nbd_send_one_meta_context(ioc, NBD_OPT_SET_META_CONTEXT, + info->name, context, errp) < 0) { + return -1; } if (nbd_receive_option_reply(ioc, NBD_OPT_SET_META_CONTEXT, &reply, diff --git a/nbd/trace-events b/nbd/trace-events index 446d10b8603..00872a6f9d4 100644 --- a/nbd/trace-events +++ b/nbd/trace-events @@ -11,7 +11,7 @@ nbd_receive_query_exports_start(const char *wantname) "Qu= erying export list for nbd_receive_query_exports_success(const char *wantname) "Found desired exp= ort name '%s'" nbd_receive_starttls_new_client(void) "Setting up TLS" nbd_receive_starttls_tls_handshake(void) "Starting TLS handshake" -nbd_opt_meta_request(const char *context, const char *export) "Requesting = to set meta context %s for export %s" +nbd_opt_meta_request(const char *optname, const char *context, const char = *export) "Requesting %s %s for export %s" nbd_opt_meta_reply(const char *context, uint32_t id) "Received mapping of = context %s to id %" PRIu32 nbd_receive_negotiate(void *tlscreds, const char *hostname) "Receiving neg= otiation tlscreds=3D%p hostname=3D%s" nbd_receive_negotiate_magic(uint64_t magic) "Magic is 0x%" PRIx64 --=20 2.17.2