Re: [Qemu-devel] [PATCH v3 02/11] block: Accept node-name for block-commit

[Eric Blake <eblake@redhat.com>]

[-- Attachment #1: Type: text/plain, Size: 1921 bytes --]

On 07/07/2016 06:11 AM, Kevin Wolf wrote:
> In order to remove the necessity to use BlockBackend names in the
> external API, we want to allow node-names everywhere. This converts
> block-commit to accept a node-name without lifting the restriction that
> we're operating at a root node.
> 
> As libvirt makes use of the DeviceNotFound error class, we must add
> explicit code to retain this behaviour because qmp_get_root_bs() only
> returns GenericErrors.

Indeed, and good thing we had the comment in the code to remind us.

> 
> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
> ---
>  blockdev.c           | 23 +++++++++++------------
>  qapi/block-core.json |  5 ++---
>  qmp-commands.hx      |  2 +-
>  3 files changed, 14 insertions(+), 16 deletions(-)
> 

> +++ b/qapi/block-core.json
> @@ -1004,7 +1004,7 @@
>  # Live commit of data from overlay image nodes into backing nodes - i.e.,
>  # writes data between 'top' and 'base' into 'base'.
>  #
> -# @device:  the name of the device
> +# @device:  the device name or node-name of a root node
>  #
>  # @base:   #optional The file name of the backing image to write data into.
>  #                    If not specified, this is the deepest backing image
> @@ -1046,9 +1046,8 @@
>  #
>  # Returns: Nothing on success
>  #          If commit or stream is already active on this device, DeviceInUse
> -#          If @device does not exist, DeviceNotFound

Except deleting this line is at odds with the special casing you added.

>  #          If image commit is not supported by this device, NotSupported
> -#          If @base or @top is invalid, a generic error is returned
> +#          If @device, @base or @top is invalid, a generic error is returned
>  #          If @speed is invalid, InvalidParameter
>  #

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


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 604 bytes --]