On 05/08/2014 12:12 PM, Max Reitz wrote:
> If the filename given to bdrv_open() is prefixed with "json:", parse the
> rest as a JSON object and merge the result into the options QDict. If
> there are conflicts, report one of them to the user and abort.

Commit message is stale compared to change in the code.

> 
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> ---
>  block.c | 41 +++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 41 insertions(+)

Code is find, though, so:

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


> +
> +        /* Options given in the filename have lower priority than options
> +         * specified directly */
> +        qdict_join(options, json_options, false);
> +        QDECREF(json_options);
> +        filename = NULL;
> +    }
> +
>      bs->options = options;
>      options = qdict_clone_shallow(options);
>  
> 

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