On 13.08.20 18:29, Kevin Wolf wrote:
> Implement a new QMP command block-export-del and make nbd-server-remove
> a wrapper around it.
> 
> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
> ---
>  qapi/block-export.json         | 30 +++++++++++++++----
>  include/block/nbd.h            |  1 -
>  block/export/export.c          | 54 ++++++++++++++++++++++++++++++++++
>  block/monitor/block-hmp-cmds.c |  2 +-
>  blockdev-nbd.c                 | 28 ------------------
>  nbd/server.c                   | 14 ---------
>  6 files changed, 79 insertions(+), 50 deletions(-)

[...]

> diff --git a/block/monitor/block-hmp-cmds.c b/block/monitor/block-hmp-cmds.c
> index 6c823234a9..10165252cf 100644
> --- a/block/monitor/block-hmp-cmds.c
> +++ b/block/monitor/block-hmp-cmds.c
> @@ -477,7 +477,7 @@ void hmp_nbd_server_remove(Monitor *mon, const QDict *qdict)
>      Error *err = NULL;
>  
>      /* Rely on NBD_SERVER_REMOVE_MODE_SAFE being the default */

This comment needs adjustment, too.

With that done:

Reviewed-by: Max Reitz <mreitz@redhat.com>

> -    qmp_nbd_server_remove(name, force, NBD_SERVER_REMOVE_MODE_HARD, &err);
> +    qmp_nbd_server_remove(name, force, BLOCK_EXPORT_REMOVE_MODE_HARD, &err);
>      hmp_handle_error(mon, err);
>  }