Re: [Qemu-block] [PATCH v2 2/6] hmp: add name parameter to nbd_server_add

2018-01-19 Thread Vladimir Sementsov-Ogievskiy

19.01.2018 00:08, Eric Blake wrote:

On 01/18/2018 12:11 PM, Vladimir Sementsov-Ogievskiy wrote:

Support name parameter for HMP too.

Signed-off-by: Vladimir Sementsov-Ogievskiy 
---
  hmp.c   | 3 ++-
  hmp-commands.hx | 9 +
  2 files changed, 7 insertions(+), 5 deletions(-)

+++ b/hmp-commands.hx
@@ -1553,8 +1553,8 @@ ETEXI
  
  {

  .name   = "nbd_server_add",
-.args_type  = "writable:-w,device:B",
-.params = "nbd_server_add [-w] device",
+.args_type  = "name:-n,writable:-w,device:B",
+.params = "nbd_server_add [-n] [-w] device",

Doesn't quite look like my proposal:
https://lists.gnu.org/archive/html/qemu-devel/2018-01/msg01639.html

-.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]",

In fact, using -n is not quite right, because that's just a boolean flag
rather than a string.



Strange, I don't have your letter. Let's use yours, of course.

--
Best regards,
Vladimir




Re: [Qemu-block] [PATCH v2 2/6] hmp: add name parameter to nbd_server_add

2018-01-18 Thread Eric Blake
On 01/18/2018 12:11 PM, Vladimir Sementsov-Ogievskiy wrote:
> Support name parameter for HMP too.
> 
> Signed-off-by: Vladimir Sementsov-Ogievskiy 
> ---
>  hmp.c   | 3 ++-
>  hmp-commands.hx | 9 +
>  2 files changed, 7 insertions(+), 5 deletions(-)
> 

> +++ b/hmp-commands.hx
> @@ -1553,8 +1553,8 @@ ETEXI
>  
>  {
>  .name   = "nbd_server_add",
> -.args_type  = "writable:-w,device:B",
> -.params = "nbd_server_add [-w] device",
> +.args_type  = "name:-n,writable:-w,device:B",
> +.params = "nbd_server_add [-n] [-w] device",

Doesn't quite look like my proposal:
https://lists.gnu.org/archive/html/qemu-devel/2018-01/msg01639.html

-.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]",

In fact, using -n is not quite right, because that's just a boolean flag
rather than a string.

-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.   +1-919-301-3266
Virtualization:  qemu.org | libvirt.org



signature.asc
Description: OpenPGP digital signature


[Qemu-block] [PATCH v2 2/6] hmp: add name parameter to nbd_server_add

2018-01-18 Thread Vladimir Sementsov-Ogievskiy
Support name parameter for HMP too.

Signed-off-by: Vladimir Sementsov-Ogievskiy 
---
 hmp.c   | 3 ++-
 hmp-commands.hx | 9 +
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/hmp.c b/hmp.c
index 37972f8322..964cff8aed 100644
--- a/hmp.c
+++ b/hmp.c
@@ -2236,10 +2236,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, _err);
+qmp_nbd_server_add(device, name != NULL, name, true, writable, _err);
 
 if (local_err != NULL) {
 hmp_handle_error(mon, _err);
diff --git a/hmp-commands.hx b/hmp-commands.hx
index 6d5ebdf6ab..cad9a9a238 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -1553,8 +1553,8 @@ ETEXI
 
 {
 .name   = "nbd_server_add",
-.args_type  = "writable:-w,device:B",
-.params = "nbd_server_add [-w] device",
+.args_type  = "name:-n,writable:-w,device:B",
+.params = "nbd_server_add [-n] [-w] device",
 .help   = "export a block device via NBD",
 .cmd= hmp_nbd_server_add,
 },
@@ -1562,8 +1562,9 @@ STEXI
 @item nbd_server_add @var{device}
 @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.
+beforehand with @command{nbd_server_start}. The @option{-n} option sets export
+name. If @option{-n} option is unspecified, the @var{device} parameter is used.
+The @option{-w} option makes the exported device writable too.
 ETEXI
 
 {
-- 
2.11.1