From: Frediano Ziglio <freddy77@gmail.com>
Date: Wed, 27 Jul 2011 18:12:02 +0000 (+0200)
Subject: raw-posix: Always check paio_init result
X-Git-Tag: qemu-xen-4.3.0-rc1~2628^2~6^2~14
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=f6e8ffc22fe153ba981f2747e4c52ea7e55f6ecc;p=qemu-upstream-4.5-testing.git

raw-posix: Always check paio_init result

Signed-off-by: Frediano Ziglio <freddy77@gmail.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---

diff --git a/block/raw-posix.c b/block/raw-posix.c
index 6dd708688..c5c99446c 100644
--- a/block/raw-posix.c
+++ b/block/raw-posix.c
@@ -230,13 +230,15 @@ static int raw_open_common(BlockDriverState *bs, const char *filename,
         }
     }
 
+    /* We're falling back to POSIX AIO in some cases so init always */
+    if (paio_init() < 0) {
+        goto out_free_buf;
+    }
+
 #ifdef CONFIG_LINUX_AIO
     if ((bdrv_flags & (BDRV_O_NOCACHE|BDRV_O_NATIVE_AIO)) ==
                       (BDRV_O_NOCACHE|BDRV_O_NATIVE_AIO)) {
 
-        /* We're falling back to POSIX AIO in some cases */
-        paio_init();
-
         s->aio_ctx = laio_init();
         if (!s->aio_ctx) {
             goto out_free_buf;
@@ -245,9 +247,6 @@ static int raw_open_common(BlockDriverState *bs, const char *filename,
     } else
 #endif
     {
-        if (paio_init() < 0) {
-            goto out_free_buf;
-        }
 #ifdef CONFIG_LINUX_AIO
         s->use_aio = 0;
 #endif