From: Avi Kivity <avi@redhat.com>
Date: Sun, 16 May 2010 11:59:57 +0000 (+0300)
Subject: block: fix aio_flush segfaults for read-only protocols (e.g. curl)
X-Git-Tag: v0.12.5~41
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=74bcc51b993c7a5835ad6a8e35f8b79b7513f072;p=thirdparty%2Fqemu.git

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)
---

diff --git a/aio.c b/aio.c
index f164a478c5e..2f086557b66 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);
 }