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 1544882954773721.4278008092406; Sat, 15 Dec 2018 06:09:14 -0800 (PST) Received: from localhost ([::1]:39205 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gYAcz-0000g5-ND for importer@patchew.org; Sat, 15 Dec 2018 09:09:13 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34749) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gYAOw-0005UO-Ff for qemu-devel@nongnu.org; Sat, 15 Dec 2018 08:54:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gYAOu-0000N3-Pe for qemu-devel@nongnu.org; Sat, 15 Dec 2018 08:54:42 -0500 Received: from mx1.redhat.com ([209.132.183.28]:58900) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gYAOr-0000JC-Gf; Sat, 15 Dec 2018 08:54:37 -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 D134958E46; Sat, 15 Dec 2018 13:54:36 +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 6EE7258821; Sat, 15 Dec 2018 13:54:35 +0000 (UTC) From: Eric Blake To: qemu-devel@nongnu.org Date: Sat, 15 Dec 2018 07:53:21 -0600 Message-Id: <20181215135324.152629-20-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.39]); Sat, 15 Dec 2018 13:54:36 +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 19/22] nbd/client: Add meta contexts to nbd_receive_export_list() 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: Kevin Wolf , vsementsov@virtuozzo.com, qemu-block@nongnu.org, rjones@redhat.com, Max Reitz , nsoffer@redhat.com, jsnow@redhat.com 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" We want to be able to detect whether a given qemu NBD server is exposing the right export(s) and dirty bitmaps, at least for regression testing. We could use 'nbd-client -l' from the upstream NBD project to list exports, but it's annoying to rely on out-of-tree binaries; furthermore, nbd-client doesn't necessarily know about all of the qemu NBD extensions. Thus, we plan on adding a new mode to qemu-nbd that merely sniffs all possible information from the server during handshake phase, then disconnects and dumps the information. This patch continues the work of the previous patch, by adding the ability to track the list of available meta contexts into NBDExportInfo. It benefits from the recent refactoring patches with a new nbd_list_meta_contexts() that reuses much of the same framework as setting a meta context. Signed-off-by: Eric Blake Reviewed-by: Richard W.M. Jones --- v2: new patch to split out collection of meta context collection s/free/g_free/ [Vladimir] --- include/block/nbd.h | 2 ++ nbd/client.c | 41 +++++++++++++++++++++++++++++++++++++++-- 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/include/block/nbd.h b/include/block/nbd.h index 09d2157efe0..6d9fbb941d7 100644 --- a/include/block/nbd.h +++ b/include/block/nbd.h @@ -284,6 +284,8 @@ struct NBDExportInfo { /* Set by server results during nbd_receive_export_list() */ char *description; + int n_contexts; + char **contexts; }; typedef struct NBDExportInfo NBDExportInfo; diff --git a/nbd/client.c b/nbd/client.c index 0e6c575ccad..d392b5e8bee 100644 --- a/nbd/client.c +++ b/nbd/client.c @@ -808,6 +808,36 @@ static int nbd_negotiate_simple_meta_context(QIOChanne= l *ioc, } } +/* + * nbd_list_meta_contexts: + * Request the server to list all meta contexts for export @info->name. + * return 0 if list is complete (even if empty), + * -1 with errp set for any other error + */ +static int nbd_list_meta_contexts(QIOChannel *ioc, + NBDExportInfo *info, + Error **errp) +{ + int ret; + + if (nbd_send_one_meta_context(ioc, NBD_OPT_LIST_META_CONTEXT, + info->name, NULL, errp) < 0) { + return -1; + } + + while (1) { + char *context; + + ret =3D nbd_receive_one_meta_context(ioc, NBD_OPT_LIST_META_CONTEX= T, + &context, NULL, errp); + if (ret <=3D 0) { + return ret; + } + info->contexts =3D g_renew(char *, info->contexts, ++info->n_conte= xts); + info->contexts[info->n_contexts - 1] =3D context; + } +} + /* * nbd_start_negotiate: * Start the handshake to the server. After a positive return, the server @@ -1054,7 +1084,7 @@ int nbd_receive_negotiate(QIOChannel *ioc, QCryptoTLS= Creds *tlscreds, /* Clean up result of nbd_receive_export_list */ void nbd_free_export_list(NBDExportInfo *info, int count) { - int i; + int i, j; if (!info) { return; @@ -1063,6 +1093,10 @@ void nbd_free_export_list(NBDExportInfo *info, int c= ount) for (i =3D 0; i < count; i++) { g_free(info[i].name); g_free(info[i].description); + for (j =3D 0; j < info[i].n_contexts; j++) { + g_free(info[i].contexts[j]); + } + g_free(info[i].contexts); } g_free(info); } @@ -1130,7 +1164,10 @@ int nbd_receive_export_list(QIOChannel *ioc, QCrypto= TLSCreds *tlscreds, break; } - /* TODO: Grab meta contexts */ + if (result =3D=3D 3 && + nbd_list_meta_contexts(ioc, &array[i], errp) < 0) { + goto out; + } } /* Send NBD_OPT_ABORT as a courtesy before hanging up */ --=20 2.17.2