aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2010-05-16 14:59:57 +0300
committerKevin Wolf <kwolf@redhat.com>2010-05-21 11:49:18 +0200
commitc53a7285b4377e91f30b7742c7e12c16d6bf86f0 (patch)
treebf012c66eddd97a04dbe4d6795cd10a1ccbba4cc
parent81a204e44356a4e147ee4bcfded3d25793c5a2ad (diff)
block: fix aio_flush segfaults for read-only protocols (e.g. curl)
Not all block format drivers expose an io_flush method (reasonable for read-only protocols), so calling io_flush there will immediately segfault. Fix by checking for the method's existence before calling it. Signed-off-by: Avi Kivity <avi@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-rw-r--r--aio.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/aio.c b/aio.c
index f164a478c5..2f086557b6 100644
--- a/aio.c
+++ b/aio.c
@@ -113,7 +113,9 @@ void qemu_aio_flush(void)
qemu_aio_wait();
QLIST_FOREACH(node, &aio_handlers, node) {
- ret |= node->io_flush(node->opaque);
+ if (node->io_flush) {
+ ret |= node->io_flush(node->opaque);
+ }
}
} while (qemu_bh_poll() || ret > 0);
}