Re: [Qemu-block] [PATCH] qcow2: remove extra local_error variable

[Max Reitz]

On 2017-05-11 17:03, Alberto Garcia wrote:
> 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 
> ---
>  block/qcow2.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)

Thanks, applied to my block branch:

https://github.com/XanClic/qemu/commits/block

Max



signature.asc
Description: OpenPGP digital signature

[Qemu-block] [PATCH] qcow2: remove extra local_error variable

[Alberto Garcia]

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 
---
 block/qcow2.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/block/qcow2.c b/block/qcow2.c
index 1c2697732b..5e9cc26c4e 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -3215,7 +3215,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 "
@@ -3227,9 +3226,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,
   _amend_helper_cb,
-  _cb_info, _error);
+  _cb_info, _err);
 if (ret < 0) {
-error_report_err(local_error);
+error_report_err(local_err);
 return ret;
 }
 }
-- 
2.11.0