* Eric Blake (ebl...@redhat.com) wrote: > Extend the flexibility of the previous QMP patch to also work > in HMP. > > Signed-off-by: Eric Blake <ebl...@redhat.com>
Thanks, that looks good to me from the HMP side; let me know which way you want to take it; I can take it via HMP once the code that uses it is in; whichever is easiest. Reviewed-by: Dr. David Alan Gilbert <dgilb...@redhat.com> > --- > > 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 = qdict_get_str(qdict, "device"); > + const char *name = qdict_get_try_str(qdict, "name"); > bool writable = qdict_get_try_bool(qdict, "writable", false); > Error *local_err = 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 != 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 = "nbd_server_add", > - .args_type = "writable:-w,device:B", > - .params = "nbd_server_add [-w] device", > + .args_type = "writable:-w,device:B,name:s?", > + .params = "nbd_server_add [-w] device [name]", > .help = "export a block device via NBD", > .cmd = 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 > > { > -- > 2.14.3 > -- Dr. David Alan Gilbert / dgilb...@redhat.com / Manchester, UK