Re: [Qemu-devel] [PATCH v3 1/2] blkdebug: Simplify and improve filename generation

[Eric Blake]

On 11/11/2014 02:23 AM, Max Reitz wrote:
> Instead of actually recreating the options from scratch, just reuse the
> options given for creating the BDS, which are the configuration file
> name and additional options. In case there are no additional options we
> can thus create a plain filename.
> 
> This obviously results in a different output for qemu-iotest 099 which
> exactly tests this filename generation. Fix it up as well.
> 
> Signed-off-by: Max Reitz <address@hidden>
> ---
>  block/blkdebug.c           | 99 
> +++++++++++++---------------------------------
>  tests/qemu-iotests/099.out |  4 +-
>  2 files changed, 30 insertions(+), 73 deletions(-)
> 

> +    if (!force_json && bs->file->exact_filename[0]) {
> +        snprintf(bs->exact_filename, sizeof(bs->exact_filename),
> +                 "blkdebug:%s:%s",
> +                 qdict_get_try_str(bs->options, "config") ?: "",

This is one case where I _like_ the fact that we allow the gcc extension
operator.  It's so much more verbose to store the function call result
into a temporary to avoid calling it twice.

Reviewed-by: Eric Blake <address@hidden>

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

signature.asc
Description: OpenPGP digital signature