[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v2 4/8] block: Reuse reference handling from bdr
From: |
Benoît Canet |
Subject: |
Re: [Qemu-devel] [PATCH v2 4/8] block: Reuse reference handling from bdrv_open() |
Date: |
Mon, 10 Feb 2014 14:42:36 +0100 |
User-agent: |
Mutt/1.5.21 (2010-09-15) |
Le Saturday 08 Feb 2014 à 18:39:15 (+0100), Max Reitz a écrit :
> Remove the reference parameter and the related handling code from
> bdrv_file_open(), since it exists in bdrv_open() now as well.
>
> Signed-off-by: Max Reitz <address@hidden>
> Reviewed-by: Benoit Canet <address@hidden>
> ---
> block.c | 33 +++++++--------------------------
> 1 file changed, 7 insertions(+), 26 deletions(-)
>
> diff --git a/block.c b/block.c
> index 432d659..4c105bb 100644
> --- a/block.c
> +++ b/block.c
> @@ -954,8 +954,7 @@ free_and_fail:
> * dictionary, it needs to use QINCREF() before calling bdrv_file_open.
> */
> static int bdrv_file_open(BlockDriverState **pbs, const char *filename,
> - const char *reference, QDict *options, int flags,
> - Error **errp)
> + QDict *options, int flags, Error **errp)
> {
> BlockDriverState *bs = NULL;
> BlockDriver *drv;
> @@ -969,24 +968,6 @@ static int bdrv_file_open(BlockDriverState **pbs, const
> char *filename,
> options = qdict_new();
> }
>
> - if (reference) {
> - if (filename || qdict_size(options)) {
> - error_setg(errp, "Cannot reference an existing block device with
> "
> - "additional options or a new filename");
> - return -EINVAL;
> - }
> - QDECREF(options);
> -
> - bs = bdrv_find(reference);
> - if (!bs) {
> - error_setg(errp, "Cannot find block device '%s'", reference);
> - return -ENODEV;
> - }
> - bdrv_ref(bs);
> - *pbs = bs;
> - return 0;
> - }
> -
> bs = bdrv_new("");
> bs->options = options;
> options = qdict_clone_shallow(options);
> @@ -1235,12 +1216,6 @@ int bdrv_open(BlockDriverState **pbs, const char
> *filename,
>
> assert(pbs);
>
> - if (flags & BDRV_O_PROTOCOL) {
> - assert(!drv);
> - return bdrv_file_open(pbs, filename, reference, options,
> - flags & ~BDRV_O_PROTOCOL, errp);
> - }
> -
> if (reference) {
> bool options_non_empty = options ? qdict_size(options) : false;
> QDECREF(options);
> @@ -1267,6 +1242,12 @@ int bdrv_open(BlockDriverState **pbs, const char
> *filename,
> return 0;
> }
>
> + if (flags & BDRV_O_PROTOCOL) {
> + assert(!drv);
> + return bdrv_file_open(pbs, filename, options, flags &
> ~BDRV_O_PROTOCOL,
> + errp);
> + }
> +
> if (*pbs) {
> bs = *pbs;
> } else {
> --
> 1.8.5.4
>
Reviewed-by: Benoit Canet <address@hidden>
- Re: [Qemu-devel] [PATCH v2 1/8] block: Change BDS parameter of bdrv_open() to **, (continued)
- [Qemu-devel] [PATCH v2 2/8] block: Add reference parameter to bdrv_open(), Max Reitz, 2014/02/08
- [Qemu-devel] [PATCH v2 3/8] block: Make bdrv_file_open() static, Max Reitz, 2014/02/08
- [Qemu-devel] [PATCH v2 4/8] block: Reuse reference handling from bdrv_open(), Max Reitz, 2014/02/08
- Re: [Qemu-devel] [PATCH v2 4/8] block: Reuse reference handling from bdrv_open(),
Benoît Canet <=
- [Qemu-devel] [PATCH v2 5/8] block: Remove bdrv_new() from bdrv_file_open(), Max Reitz, 2014/02/08
- [Qemu-devel] [PATCH v2 6/8] block: Handle bs->options in bdrv_open() only, Max Reitz, 2014/02/08
- [Qemu-devel] [PATCH v2 7/8] block: Reuse success path from bdrv_open(), Max Reitz, 2014/02/08
- [Qemu-devel] [PATCH v2 8/8] block: Remove bdrv_open_image()'s force_raw option, Max Reitz, 2014/02/08