Re: [Qemu-devel] [PATCH 4/7] block: Add options QDict to bdrv_open_common()

[Stefan Hajnoczi]

On Fri, Mar 01, 2013 at 09:13:38PM +0100, Kevin Wolf wrote:
> diff --git a/block.c b/block.c
> index bf93dd1..e0e3b99 100644
> --- a/block.c
> +++ b/block.c
> @@ -665,15 +665,18 @@ static int bdrv_open_flags(BlockDriverState *bs, int 
> flags)
>  
>  /*
>   * Common part for opening disk images and files
> + *
> + * Removes all processed options from *options.
>   */
>  static int bdrv_open_common(BlockDriverState *bs, BlockDriverState *file,
> -    const char *filename,
> +    const char *filename, QDict *options,

The function already has an "options" local variable which will shadow:

    /* For snapshot=on, create a temporary qcow2 overlay */
    if (flags & BDRV_O_SNAPSHOT) {
        BlockDriverState *bs1;
        int64_t total_size;
        int is_protocol = 0;
        BlockDriver *bdrv_qcow2;
        QEMUOptionParameter *options;

This could be fixed in a follow-up patch.

Stefan