[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 06/15] qcow2: remove extra local_error variable
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PULL 06/15] qcow2: remove extra local_error variable |
Date: |
Mon, 29 May 2017 17:06:45 +0200 |
From: Alberto Garcia <address@hidden>
Commit d7086422b1c1e75e320519cfe26176db6ec97a37 added a local_err
variable global to the qcow2_amend_options() function, so there's no
need to have this other one.
Signed-off-by: Alberto Garcia <address@hidden>
Message-id: address@hidden
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Max Reitz <address@hidden>
---
block/qcow2.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/block/qcow2.c b/block/qcow2.c
index a8d61f0..b3ba5da 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -3222,7 +3222,6 @@ static int qcow2_amend_options(BlockDriverState *bs,
QemuOpts *opts,
if (s->refcount_bits != refcount_bits) {
int refcount_order = ctz32(refcount_bits);
- Error *local_error = NULL;
if (new_version < 3 && refcount_bits != 16) {
error_report("Different refcount widths than 16 bits require "
@@ -3234,9 +3233,9 @@ static int qcow2_amend_options(BlockDriverState *bs,
QemuOpts *opts,
helper_cb_info.current_operation = QCOW2_CHANGING_REFCOUNT_ORDER;
ret = qcow2_change_refcount_order(bs, refcount_order,
&qcow2_amend_helper_cb,
- &helper_cb_info, &local_error);
+ &helper_cb_info, &local_err);
if (ret < 0) {
- error_report_err(local_error);
+ error_report_err(local_err);
return ret;
}
}
--
1.8.3.1
- [Qemu-block] [PULL 00/15] Block layer patches, Kevin Wolf, 2017/05/29
- [Qemu-block] [PULL 02/15] qemu-iotests: Test streaming with missing job ID, Kevin Wolf, 2017/05/29
- [Qemu-block] [PULL 01/15] stream: fix crash in stream_start() when block_job_create() fails, Kevin Wolf, 2017/05/29
- [Qemu-block] [PULL 03/15] iotests: 147: Don't test inet6 if not available, Kevin Wolf, 2017/05/29
- [Qemu-block] [PULL 05/15] mirror: Drop permissions on s->target on completion, Kevin Wolf, 2017/05/29
- [Qemu-block] [PULL 04/15] nvme: Add support for Controller Memory Buffers, Kevin Wolf, 2017/05/29
- [Qemu-block] [PULL 07/15] qemu-img: Fix documentation of convert, Kevin Wolf, 2017/05/29
- [Qemu-block] [PULL 08/15] qemu-img: add support for --object with 'dd' command, Kevin Wolf, 2017/05/29
- [Qemu-block] [PULL 06/15] qcow2: remove extra local_error variable,
Kevin Wolf <=
- [Qemu-block] [PULL 09/15] qemu-img: fix --image-opts usage with dd command, Kevin Wolf, 2017/05/29
- [Qemu-block] [PULL 10/15] qemu-img: introduce --target-image-opts for 'convert' command, Kevin Wolf, 2017/05/29
- [Qemu-block] [PULL 12/15] qemu-img: Fix leakage of options on error, Kevin Wolf, 2017/05/29
- [Qemu-block] [PULL 11/15] qemu-img: copy *key-secret opts when opening newly created files, Kevin Wolf, 2017/05/29
- [Qemu-block] [PULL 13/15] block: Tweak error message related to qemu-img amend, Kevin Wolf, 2017/05/29
- [Qemu-block] [PULL 14/15] block: Fix backing paths for filenames with colons, Kevin Wolf, 2017/05/29
- [Qemu-block] [PULL 15/15] block/file-*: *_parse_filename() and colons, Kevin Wolf, 2017/05/29
- Re: [Qemu-block] [PULL 00/15] Block layer patches, Stefan Hajnoczi, 2017/05/30