On 09/19/2016 11:54 AM, Kevin Wolf wrote:
> In order to remove the necessity to use BlockBackend names in the
> external API, we want to allow qdev device names in all device related
> commands.
> 
> This converts blockdev-open/close-tray to accept a qdev device name.
> 
> Signed-off-by: Kevin Wolf <kw...@redhat.com>
> ---
>  blockdev.c           | 61 
> +++++++++++++++++++++++++++++++++++++++-------------
>  qapi/block-core.json | 14 ++++++++----
>  qmp-commands.hx      | 16 ++++++++------
>  3 files changed, 66 insertions(+), 25 deletions(-)
> 

> +++ b/qmp-commands.hx
> @@ -4295,7 +4295,7 @@ EQMP
>  
>      {
>          .name       = "blockdev-open-tray",
> -        .args_type  = "device:s,force:b?",
> +        .args_type  = "device:s?,id:s?,force:b?",
>          .mhandler.cmd_new = qmp_marshal_blockdev_open_tray,
>      },

Let the merge conflicts begin! Commit 33e1666b has landed.

> @@ -4329,7 +4331,7 @@ Arguments:
>  Example:
>  
>  -> { "execute": "blockdev-open-tray",
> -     "arguments": { "device": "ide1-cd0" } }
> +     "arguments": { "id": "ide0-1-0" } }

The changes to the examples look good.  Overall, I'm fine with:

Reviewed-by: Eric Blake <ebl...@redhat.com>

but I'm afraid it may be easiest for you to respin v3 and do the rebase
work here and elsewhere in the series.

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org

Attachment: signature.asc
Description: OpenPGP digital signature

Reply via email to