diff options
| author | Eric Blake <eblake@redhat.com> | 2018-01-25 08:45:57 -0600 |
|---|---|---|
| committer | Eric Blake <eblake@redhat.com> | 2018-01-26 09:56:12 -0600 |
| commit | 08fb10a7292637eb5836b8ac07b7ef8267db03be (patch) | |
| tree | 30550b8a851e2be1eb5f9a4f2ff28c6e259b5b4a | |
| parent | 2dadedce2b2fbdfdce1de8f108a3d67c2241df87 (diff) | |
hmp: Add nbd_server_remove to mirror QMP command
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 <eblake@redhat.com>
Message-Id: <20180125144557.25502-1-eblake@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
| -rw-r--r-- | hmp-commands.hx | 17 | ||||
| -rw-r--r-- | hmp.c | 14 | ||||
| -rw-r--r-- | hmp.h | 1 |
3 files changed, 29 insertions, 3 deletions
diff --git a/hmp-commands.hx b/hmp-commands.hx index b8b6fb9184..c36a9ec465 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1568,6 +1568,23 @@ defaulting to @var{device}. ETEXI { + .name = "nbd_server_remove", + .args_type = "force:-f,name:s", + .params = "nbd_server_remove [-f] name", + .help = "remove an export previously exposed via NBD", + .cmd = 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 + + { .name = "nbd_server_stop", .args_type = "", .params = "nbd_server_stop", @@ -2226,10 +2226,18 @@ void hmp_nbd_server_add(Monitor *mon, const QDict *qdict) Error *local_err = NULL; qmp_nbd_server_add(device, !!name, name, true, writable, &local_err); + hmp_handle_error(mon, &local_err); +} - if (local_err != NULL) { - hmp_handle_error(mon, &local_err); - } +void hmp_nbd_server_remove(Monitor *mon, const QDict *qdict) +{ + const char *name = qdict_get_str(qdict, "name"); + bool force = qdict_get_try_bool(qdict, "force", false); + Error *err = 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) @@ -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); |