From nobody Fri May 3 14:45:31 2024 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 1516891648076539.9350119703338; Thu, 25 Jan 2018 06:47:28 -0800 (PST) Received: from localhost ([::1]:44679 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eeioE-0007TA-5F for importer@patchew.org; Thu, 25 Jan 2018 09:47:22 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60599) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eein4-00072i-Hx for qemu-devel@nongnu.org; Thu, 25 Jan 2018 09:46:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eein3-0003R0-GJ for qemu-devel@nongnu.org; Thu, 25 Jan 2018 09:46:10 -0500 Received: from mx1.redhat.com ([209.132.183.28]:57922) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eeimx-0003Na-4Z; Thu, 25 Jan 2018 09:46:03 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 35CDC6516B; Thu, 25 Jan 2018 14:46:02 +0000 (UTC) Received: from red.redhat.com (ovpn-124-3.rdu2.redhat.com [10.10.124.3]) by smtp.corp.redhat.com (Postfix) with ESMTP id 58DE760635; Thu, 25 Jan 2018 14:45:59 +0000 (UTC) From: Eric Blake To: qemu-devel@nongnu.org Date: Thu, 25 Jan 2018 08:45:57 -0600 Message-Id: <20180125144557.25502-1-eblake@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Thu, 25 Jan 2018 14:46:02 +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] hmp: Add nbd_server_remove to mirror QMP command 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, qemu-block@nongnu.org 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" Since everything else about the nbd-server-* QMP commands is accessible from HMP, we might as well make removing an export available as well. For now, I went with a bool flag rather than a mode string for choosing between safe (default) and hard modes. Signed-off-by: Eric Blake Reviewed-by: Dr. David Alan Gilbert Reviewed-by: Kevin Wolf --- Based-on: <20180119135719.24745-1-vsementsov@virtuozzo.com> ([PATCH v3 0/5] nbd export qmp interface) hmp.h | 1 + hmp.c | 14 +++++++++++--- hmp-commands.hx | 17 +++++++++++++++++ 3 files changed, 29 insertions(+), 3 deletions(-) diff --git a/hmp.h b/hmp.h index a6f56b1f29e..536cb91caa4 100644 --- a/hmp.h +++ b/hmp.h @@ -101,6 +101,7 @@ void hmp_sendkey(Monitor *mon, const QDict *qdict); void hmp_screendump(Monitor *mon, const QDict *qdict); void hmp_nbd_server_start(Monitor *mon, const QDict *qdict); void hmp_nbd_server_add(Monitor *mon, const QDict *qdict); +void hmp_nbd_server_remove(Monitor *mon, const QDict *qdict); void hmp_nbd_server_stop(Monitor *mon, const QDict *qdict); void hmp_chardev_add(Monitor *mon, const QDict *qdict); void hmp_chardev_change(Monitor *mon, const QDict *qdict); diff --git a/hmp.c b/hmp.c index 7a64dd59c5c..b3de32d219b 100644 --- a/hmp.c +++ b/hmp.c @@ -2226,10 +2226,18 @@ void hmp_nbd_server_add(Monitor *mon, const QDict *= qdict) Error *local_err =3D NULL; qmp_nbd_server_add(device, !!name, name, true, writable, &local_err); + hmp_handle_error(mon, &local_err); +} - if (local_err !=3D NULL) { - hmp_handle_error(mon, &local_err); - } +void hmp_nbd_server_remove(Monitor *mon, const QDict *qdict) +{ + const char *name =3D qdict_get_str(qdict, "name"); + bool force =3D qdict_get_try_bool(qdict, "force", false); + Error *err =3D NULL; + + /* Rely on NBD_SERVER_REMOVE_MODE_SAFE being the default */ + qmp_nbd_server_remove(name, force, NBD_SERVER_REMOVE_MODE_HARD, &err); + hmp_handle_error(mon, &err); } void hmp_nbd_server_stop(Monitor *mon, const QDict *qdict) diff --git a/hmp-commands.hx b/hmp-commands.hx index b8b6fb91848..8a59338bc20 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1565,6 +1565,23 @@ Export a block device through QEMU's NBD server, whi= ch must be started beforehand with @command{nbd_server_start}. The @option{-w} option makes = the exported device writable too. The export name is controlled by @var{name}, defaulting to @var{device}. +ETEXI + + { + .name =3D "nbd_server_remove", + .args_type =3D "force:-f,name:s", + .params =3D "nbd_server_remove [-f] name", + .help =3D "remove an export previously exposed via NBD", + .cmd =3D hmp_nbd_server_remove, + }, +STEXI +@item nbd_server_remove [-f] @var{name} +@findex nbd_server_remove +Stop exporting a block device through QEMU's NBD server, which was +previously started with @command{nbd_server_add}. The @option{-f} +option forces the server to drop the export immediately even if +clients are connected; otherwise the command fails unless there are no +clients. ETEXI { --=20 2.14.3