summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Wolf <kwolf@redhat.com>2010-07-01 16:08:51 +0200
committerKevin Wolf <kwolf@redhat.com>2010-07-02 15:44:12 +0200
commitde189a1b4a471d37a2909e97646654fc9751b52f (patch)
treef03df0cfa7f24a156d289ce556cb76902a0a318a
parent453f9a1652629e5805995b165be2e634c8487139 (diff)
downloadhqemu-de189a1b4a471d37a2909e97646654fc9751b52f.zip
hqemu-de189a1b4a471d37a2909e97646654fc9751b52f.tar.gz
block: Handle multiwrite errors only when all requests have completed
Don't try to be clever by freeing all temporary data and calling all callbacks when the return value (an error) is certain. Doing so has at least two important problems: * The temporary data that is freed (qiov, possibly zero buffer) is still used by the requests that have not yet completed. * Calling the callbacks for all requests in the multiwrite means for the caller that it may free buffers etc. which are still in use. Just remember the error value and do the cleanup when all requests have completed. Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-rw-r--r--block.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/block.c b/block.c
index e65971c..dd6dd76 100644
--- a/block.c
+++ b/block.c
@@ -2042,14 +2042,11 @@ static void multiwrite_cb(void *opaque, int ret)
if (ret < 0 && !mcb->error) {
mcb->error = ret;
- multiwrite_user_cb(mcb);
}
mcb->num_requests--;
if (mcb->num_requests == 0) {
- if (mcb->error == 0) {
- multiwrite_user_cb(mcb);
- }
+ multiwrite_user_cb(mcb);
qemu_free(mcb);
}
}
OpenPOWER on IntegriCloud