From nobody Sun Oct 5 15:34:25 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 Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1515526159945411.58761678160135; Tue, 9 Jan 2018 11:29:19 -0800 (PST) Received: from localhost ([::1]:42803 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eYza7-0001wL-TM for importer@patchew.org; Tue, 09 Jan 2018 14:29:07 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36855) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eYzZB-0001Zo-T6 for qemu-devel@nongnu.org; Tue, 09 Jan 2018 14:28:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eYzZ9-0005z9-BD for qemu-devel@nongnu.org; Tue, 09 Jan 2018 14:28:09 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52072) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eYzZ9-0005xe-4Z for qemu-devel@nongnu.org; Tue, 09 Jan 2018 14:28:07 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 12FDCC057F81; Tue, 9 Jan 2018 19:28:06 +0000 (UTC) Received: from red.redhat.com (ovpn-124-124.rdu2.redhat.com [10.10.124.124]) by smtp.corp.redhat.com (Postfix) with ESMTP id 419757F7F7; Tue, 9 Jan 2018 19:28:05 +0000 (UTC) From: Eric Blake To: qemu-devel@nongnu.org Date: Tue, 9 Jan 2018 13:28:02 -0600 Message-Id: <20180109192802.17167-1-eblake@redhat.com> In-Reply-To: <20171208173321.GR2403@work-vm> References: <20171208173321.GR2403@work-vm> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Tue, 09 Jan 2018 19:28:06 +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 2.5/6] hmp: Add name parameter to nbd_server_add 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: vsementsov@virtuozzo.com, dgilbert@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" Extend the flexibility of the previous QMP patch to also work in HMP. Signed-off-by: Eric Blake Reviewed-by: Dr. David Alan Gilbert --- In response to Dave's request. I could also squash this into Vladimir's 2/6 if desired. hmp.c | 3 ++- hmp-commands.hx | 9 +++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/hmp.c b/hmp.c index 80c5b01540..c9fcdc8593 100644 --- a/hmp.c +++ b/hmp.c @@ -2221,10 +2221,11 @@ exit: void hmp_nbd_server_add(Monitor *mon, const QDict *qdict) { const char *device =3D qdict_get_str(qdict, "device"); + const char *name =3D qdict_get_try_str(qdict, "name"); bool writable =3D qdict_get_try_bool(qdict, "writable", false); Error *local_err =3D NULL; - qmp_nbd_server_add(device, false, NULL, true, writable, &local_err); + qmp_nbd_server_add(device, !!name, name, true, writable, &local_err); if (local_err !=3D NULL) { hmp_handle_error(mon, &local_err); diff --git a/hmp-commands.hx b/hmp-commands.hx index 6d5ebdf6ab..b8b6fb9184 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1553,17 +1553,18 @@ ETEXI { .name =3D "nbd_server_add", - .args_type =3D "writable:-w,device:B", - .params =3D "nbd_server_add [-w] device", + .args_type =3D "writable:-w,device:B,name:s?", + .params =3D "nbd_server_add [-w] device [name]", .help =3D "export a block device via NBD", .cmd =3D hmp_nbd_server_add, }, STEXI -@item nbd_server_add @var{device} +@item nbd_server_add @var{device} [ @var{name} ] @findex nbd_server_add Export a block device through QEMU's NBD server, which must be started beforehand with @command{nbd_server_start}. The @option{-w} option makes = the -exported device writable too. +exported device writable too. The export name is controlled by @var{name}, +defaulting to @var{device}. ETEXI { --=20 2.14.3