summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2010-05-16 14:59:57 +0300
committerDoug Goldstein <cardoe@gentoo.org>2010-07-20 17:29:13 -0500
commit87b7dfe2ebd17f8cc85626aeacef115505b709ae (patch)
tree17a54d882705808407d04fed2484cb3c24293161
parentvirtio-blk: fix barrier support (diff)
downloadqemu-kvm-87b7dfe2ebd17f8cc85626aeacef115505b709ae.tar.gz
qemu-kvm-87b7dfe2ebd17f8cc85626aeacef115505b709ae.tar.bz2
qemu-kvm-87b7dfe2ebd17f8cc85626aeacef115505b709ae.zip
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> (cherry picked from commit c53a7285b4377e91f30b7742c7e12c16d6bf86f0)
-rw-r--r--aio.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/aio.c b/aio.c
index f164a478c..2f086557b 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);
}