qcow2: remove extra local_error variable
PATCH 1/1 qcow2: remove extra local_error variable
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 <[email protected]>
--- block/qcow2.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
block/qcow2.c +2 -3
@@ -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, &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; } }
Signature · 1 line
2.11.0
Quoted 8 lines · Alberto Garcia
Commit
d7086422b1c1e75e320519cfe26176db6ec97a37added alocal_errvariable global to theqcow2_amend_options()function, so there's no need to have this other one.Signed-off-by Alberto Garcia <[email protected]>--- block/qcow2.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
Reviewed-by Eric Blake <[email protected]>
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org
Max Reitz
AppliedQuoted 8 lines · Alberto Garcia
Commit
d7086422b1c1e75e320519cfe26176db6ec97a37added alocal_errvariable global to theqcow2_amend_options()function, so there's no need to have this other one.Signed-off-by Alberto Garcia <[email protected]>--- 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