[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 08/11] block: mirror - use local_err to avoid NULL er
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 08/11] block: mirror - use local_err to avoid NULL errp |
Date: |
Fri, 14 Feb 2014 18:29:30 +0100 |
From: Jeff Cody <address@hidden>
When starting a block job, commit_active_start() relies on whether *errp
is set by mirror_start_job. This allows it to determine if the mirror
job start failed, so that it can clean up any changes to open flags from
the bdrv_reopen(). If errp is NULL, then it will not be able to
determine if mirror_start_job failed or not.
To avoid this, use a local Error variable, and then propagate the error
(if any) to errp.
Reported-by: Markus Armbruster <address@hidden>
Signed-off-by: Jeff Cody <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
block/mirror.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/block/mirror.c b/block/mirror.c
index 26d18e4..e683959 100644
--- a/block/mirror.c
+++ b/block/mirror.c
@@ -634,6 +634,7 @@ void commit_active_start(BlockDriverState *bs,
BlockDriverState *base,
int64_t length, base_length;
int orig_base_flags;
int ret;
+ Error *local_err = NULL;
orig_base_flags = bdrv_get_flags(base);
@@ -668,9 +669,10 @@ void commit_active_start(BlockDriverState *bs,
BlockDriverState *base,
bdrv_ref(base);
mirror_start_job(bs, base, speed, 0, 0,
- on_error, on_error, cb, opaque, errp,
+ on_error, on_error, cb, opaque, &local_err,
&commit_active_job_driver, false, base);
- if (error_is_set(errp)) {
+ if (error_is_set(&local_err)) {
+ error_propagate(errp, local_err);
goto error_restore_flags;
}
--
1.8.5.3
- [Qemu-devel] [PULL 00/11] Block patches, Stefan Hajnoczi, 2014/02/14
- [Qemu-devel] [PULL 01/11] sdhci: Drop unnecessary #include, Stefan Hajnoczi, 2014/02/14
- [Qemu-devel] [PULL 03/11] block: Add notes to iSCSI's .bdrv_open and .bdrv_reopen_prepare, Stefan Hajnoczi, 2014/02/14
- [Qemu-devel] [PULL 02/11] blockdev: Remove 'type' parameter from blockdev_init(), Stefan Hajnoczi, 2014/02/14
- [Qemu-devel] [PULL 04/11] block: Don't throw away errno via error_setg, Stefan Hajnoczi, 2014/02/14
- [Qemu-devel] [PULL 05/11] block: qemu-iotests - fix test 070 (vhdx), Stefan Hajnoczi, 2014/02/14
- [Qemu-devel] [PULL 07/11] qemu-iotests: Don't run 005 on vmdk split formats, Stefan Hajnoczi, 2014/02/14
- [Qemu-devel] [PULL 06/11] block: qemu-iotests - add vhdx log replay tests for qemu-img, Stefan Hajnoczi, 2014/02/14
- [Qemu-devel] [PULL 09/11] blockdev: Fix wrong usage of QDECREF causing snapshoted quorum to crash on close., Stefan Hajnoczi, 2014/02/14
- [Qemu-devel] [PULL 08/11] block: mirror - use local_err to avoid NULL errp,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 11/11] block: Open by reference will try device then node_name., Stefan Hajnoczi, 2014/02/14
- [Qemu-devel] [PULL 10/11] block: Relax bdrv_lookup_bs constraints., Stefan Hajnoczi, 2014/02/14
- Re: [Qemu-devel] [PULL 00/11] Block patches, Peter Maydell, 2014/02/15