Re: [Qemu-devel] [PATCH V6 8/8] block: Use graph node name as reference in bdrv_file_open().

[Kevin Wolf]

Am 23.01.2014 um 21:31 hat Benoît Canet geschrieben:
> Signed-off-by: Benoit Canet <address@hidden>
> ---
>  block.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)

I'm not going to merge this one yet. It breaks qemu-iotests case 071,
which would have to be adapted.

However, first of all I'd like to hear the opinions of at least Eric and
Max on what BlockRef should really refer to. I think node names make
most sense, but perhaps it's a bit inconvenient and the command line
should default to node-name = id when id is set, but node-name isn't?

Kevin

> diff --git a/block.c b/block.c
> index 3e0994b..7726636 100644
> --- a/block.c
> +++ b/block.c
> @@ -908,15 +908,15 @@ int bdrv_file_open(BlockDriverState **pbs, const char 
> *filename,
>  
>      if (reference) {
>          if (filename || qdict_size(options)) {
> -            error_setg(errp, "Cannot reference an existing block device with 
> "
> +            error_setg(errp, "Cannot reference an existing graph node with "
>                         "additional options or a new filename");
>              return -EINVAL;
>          }
>          QDECREF(options);
>  
> -        bs = bdrv_find(reference);
> +        bs = bdrv_find_node(reference);
>          if (!bs) {
> -            error_setg(errp, "Cannot find block device '%s'", reference);
> +            error_setg(errp, "Cannot find graph node '%s'", reference);
>              return -ENODEV;
>          }
>          bdrv_ref(bs);
> -- 
> 1.8.3.2
>