[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 09/20] cow: correctly propagate errors
From: |
Fam Zheng |
Subject: |
Re: [Qemu-devel] [PATCH 09/20] cow: correctly propagate errors |
Date: |
Mon, 10 Feb 2014 16:04:53 +0800 |
User-agent: |
Mutt/1.5.22 (2013-10-16) |
On Sun, 02/09 10:48, Paolo Bonzini wrote:
> Signed-off-by: Paolo Bonzini <address@hidden>
> ---
> block/cow.c | 12 +++---------
> 1 file changed, 3 insertions(+), 9 deletions(-)
>
> diff --git a/block/cow.c b/block/cow.c
> index 7fc0b12..43a2150 100644
> --- a/block/cow.c
> +++ b/block/cow.c
> @@ -82,7 +82,7 @@ static int cow_open(BlockDriverState *bs, QDict *options,
> int flags,
> char version[64];
> snprintf(version, sizeof(version),
> "COW version %d", cow_header.version);
> - qerror_report(QERR_UNKNOWN_BLOCK_FORMAT_FEATURE,
> + error_set(errp, QERR_UNKNOWN_BLOCK_FORMAT_FEATURE,
> bs->device_name, "cow", version);
> ret = -ENOTSUP;
> goto fail;
> @@ -330,7 +330,6 @@ static int cow_create(const char *filename,
> QEMUOptionParameter *options,
> struct stat st;
> int64_t image_sectors = 0;
> const char *image_filename = NULL;
> - Error *local_err = NULL;
> int ret;
> BlockDriverState *cow_bs;
>
> @@ -344,18 +343,13 @@ static int cow_create(const char *filename,
> QEMUOptionParameter *options,
> options++;
> }
>
> - ret = bdrv_create_file(filename, options, &local_err);
> + ret = bdrv_create_file(filename, options, errp);
> if (ret < 0) {
> - qerror_report_err(local_err);
> - error_free(local_err);
> return ret;
> }
>
> - ret = bdrv_file_open(&cow_bs, filename, NULL, NULL, BDRV_O_RDWR,
> - &local_err);
> + ret = bdrv_file_open(&cow_bs, filename, NULL, NULL, BDRV_O_RDWR, errp);
> if (ret < 0) {
> - qerror_report_err(local_err);
> - error_free(local_err);
> return ret;
> }
>
> --
> 1.8.5.3
>
I'm never sure about choice of using local_err with error_propagate, or
straightly pass errp, but the logic still looks right to me, so,
Reviewed-by: Fam Zheng <address@hidden>
- [Qemu-devel] [PATCH 00/20] Improve bdrv_open error messages, Paolo Bonzini, 2014/02/09
- [Qemu-devel] [PATCH 01/20] nbd: produce a better error if neither host nor port is passed, Paolo Bonzini, 2014/02/09
- [Qemu-devel] [PATCH 02/20] nbd: correctly propagate errors, Paolo Bonzini, 2014/02/09
- [Qemu-devel] [PATCH 03/20] nbd: inline tcp_socket_incoming_spec into sole caller, Paolo Bonzini, 2014/02/09
- [Qemu-devel] [PATCH 09/20] cow: correctly propagate errors, Paolo Bonzini, 2014/02/09
- Re: [Qemu-devel] [PATCH 09/20] cow: correctly propagate errors,
Fam Zheng <=
- [Qemu-devel] [PATCH 04/20] nbd: move socket wrappers to qemu-nbd, Paolo Bonzini, 2014/02/09
- [Qemu-devel] [PATCH 05/20] iscsi: fix indentation, Paolo Bonzini, 2014/02/09
- [Qemu-devel] [PATCH 06/20] iscsi: correctly propagate errors in iscsi_open, Paolo Bonzini, 2014/02/09
- [Qemu-devel] [PATCH 07/20] gluster: default scheme to gluster:// and host to localhost., Paolo Bonzini, 2014/02/09
- [Qemu-devel] [PATCH 08/20] gluster: correctly propagate errors, Paolo Bonzini, 2014/02/09