From patchwork Thu Feb 4 13:50:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= X-Patchwork-Id: 8221671 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 060319F1C1 for ; Thu, 4 Feb 2016 13:51:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 50BC12034C for ; Thu, 4 Feb 2016 13:51:15 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 81F4A20375 for ; Thu, 4 Feb 2016 13:51:14 +0000 (UTC) Received: from localhost ([::1]:41897 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aRKJV-0003l2-TI for patchwork-qemu-devel@patchwork.kernel.org; Thu, 04 Feb 2016 08:51:13 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36120) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aRKJB-0003as-3V for qemu-devel@nongnu.org; Thu, 04 Feb 2016 08:50:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aRKJ7-0003FS-8B for qemu-devel@nongnu.org; Thu, 04 Feb 2016 08:50:53 -0500 Received: from mx1.redhat.com ([209.132.183.28]:51058) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aRKJ7-0003El-1O for qemu-devel@nongnu.org; Thu, 04 Feb 2016 08:50:49 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id A1C8A18B32B for ; Thu, 4 Feb 2016 13:50:48 +0000 (UTC) Received: from t530wlan.home.berrange.com.com (vpn1-6-8.ams2.redhat.com [10.36.6.8]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u14DoTEQ028626; Thu, 4 Feb 2016 08:50:47 -0500 From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Thu, 4 Feb 2016 13:50:16 +0000 Message-Id: <1454593822-7321-11-git-send-email-berrange@redhat.com> In-Reply-To: <1454593822-7321-1-git-send-email-berrange@redhat.com> References: <1454593822-7321-1-git-send-email-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Kevin Wolf , Paolo Bonzini , Max Reitz Subject: [Qemu-devel] [PATCH v5 10/16] nbd: allow setting of an export name for qemu-nbd server X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The qemu-nbd server currently always uses the old style protocol since it never sets any export name. This is a problem because future TLS support will require use of the new style protocol negotiation. This adds "--exportname NAME" / "-x NAME" arguments to qemu-nbd which allow the user to set an explicit export name. When an export name is set the server will always use the new style NBD protocol. Signed-off-by: Daniel P. Berrange --- qemu-nbd.c | 14 ++++++++++++-- qemu-nbd.texi | 3 +++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/qemu-nbd.c b/qemu-nbd.c index c96e3ab..bf9a609 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -45,6 +45,7 @@ #define QEMU_NBD_OPT_OBJECT 5 static NBDExport *exp; +static bool newproto; static int verbose; static char *srcpath; static SocketAddress *saddr; @@ -340,7 +341,7 @@ static gboolean nbd_accept(QIOChannel *ioc, GIOCondition cond, gpointer opaque) nb_fds++; nbd_update_server_watch(); - nbd_client_new(exp, cioc, nbd_client_closed); + nbd_client_new(newproto ? NULL : exp, cioc, nbd_client_closed); object_unref(OBJECT(cioc)); return TRUE; @@ -414,7 +415,7 @@ int main(int argc, char **argv) off_t fd_size; QemuOpts *sn_opts = NULL; const char *sn_id_or_name = NULL; - const char *sopt = "hVb:o:p:rsnP:c:dvk:e:f:tl:"; + const char *sopt = "hVb:o:p:rsnP:c:dvk:e:f:tl:x:"; struct option lopt[] = { { "help", 0, NULL, 'h' }, { "version", 0, NULL, 'V' }, @@ -438,6 +439,7 @@ int main(int argc, char **argv) { "persistent", 0, NULL, 't' }, { "verbose", 0, NULL, 'v' }, { "object", 1, NULL, QEMU_NBD_OPT_OBJECT }, + { "export-name", 1, NULL, 'x' }, { NULL, 0, NULL, 0 } }; int ch; @@ -454,6 +456,7 @@ int main(int argc, char **argv) Error *local_err = NULL; BlockdevDetectZeroesOptions detect_zeroes = BLOCKDEV_DETECT_ZEROES_OPTIONS_OFF; QDict *options = NULL; + const char *export_name = NULL; /* The client thread uses SIGTERM to interrupt the server. A signal * handler ensures that "qemu-nbd -v -c" exits with a nice status code. @@ -605,6 +608,9 @@ int main(int argc, char **argv) case 't': persistent = 1; break; + case 'x': + export_name = optarg; + break; case 'v': verbose = 1; break; @@ -784,6 +790,10 @@ int main(int argc, char **argv) error_report_err(local_err); exit(EXIT_FAILURE); } + if (export_name) { + nbd_export_set_name(exp, export_name); + newproto = true; + } server_ioc = qio_channel_socket_new(); if (qio_channel_socket_listen_sync(server_ioc, saddr, &local_err) < 0) { diff --git a/qemu-nbd.texi b/qemu-nbd.texi index 9f9daca..5fbe486 100644 --- a/qemu-nbd.texi +++ b/qemu-nbd.texi @@ -63,6 +63,9 @@ Export QEMU disk image using NBD protocol. force block driver for format @var{fmt} instead of auto-detecting @item -t, --persistent don't exit on the last connection +@item -x NAME, --export-name=NAME + set the NDB volume export name. This switches the server to use + the new style NBD protocol negotiation @item -v, --verbose display extra debugging information @item -h, --help