* [Qemu-devel] [PATCH] qcow2: remove extra local_error variable
@ 2017-05-11 15:03 Alberto Garcia
2017-05-11 16:19 ` Eric Blake
2017-05-12 16:53 ` [Qemu-devel] [Qemu-block] " Max Reitz
0 siblings, 2 replies; 3+ messages in thread
From: Alberto Garcia @ 2017-05-11 15:03 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-block, Kevin Wolf, 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 <berto@igalia.com>
---
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,
&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;
}
}
--
2.11.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH] qcow2: remove extra local_error variable
2017-05-11 15:03 [Qemu-devel] [PATCH] qcow2: remove extra local_error variable Alberto Garcia
@ 2017-05-11 16:19 ` Eric Blake
2017-05-12 16:53 ` [Qemu-devel] [Qemu-block] " Max Reitz
1 sibling, 0 replies; 3+ messages in thread
From: Eric Blake @ 2017-05-11 16:19 UTC (permalink / raw)
To: Alberto Garcia, qemu-devel; +Cc: Kevin Wolf, qemu-block
[-- Attachment #1: Type: text/plain, Size: 546 bytes --]
On 05/11/2017 10:03 AM, 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 <berto@igalia.com>
> ---
> block/qcow2.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
Reviewed-by: Eric Blake <eblake@redhat.com>
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3266
Virtualization: qemu.org | libvirt.org
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 604 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [Qemu-block] [PATCH] qcow2: remove extra local_error variable
2017-05-11 15:03 [Qemu-devel] [PATCH] qcow2: remove extra local_error variable Alberto Garcia
2017-05-11 16:19 ` Eric Blake
@ 2017-05-12 16:53 ` Max Reitz
1 sibling, 0 replies; 3+ messages in thread
From: Max Reitz @ 2017-05-12 16:53 UTC (permalink / raw)
To: Alberto Garcia, qemu-devel; +Cc: Kevin Wolf, qemu-block
[-- Attachment #1: Type: text/plain, Size: 457 bytes --]
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 <berto@igalia.com>
> ---
> 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 498 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-05-12 16:53 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-05-11 15:03 [Qemu-devel] [PATCH] qcow2: remove extra local_error variable Alberto Garcia
2017-05-11 16:19 ` Eric Blake
2017-05-12 16:53 ` [Qemu-devel] [Qemu-block] " Max Reitz
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.