From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:33503) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qm8ad-0006yl-Mx for qemu-devel@nongnu.org; Wed, 27 Jul 2011 14:12:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qm8ac-0002OH-BF for qemu-devel@nongnu.org; Wed, 27 Jul 2011 14:12:15 -0400 From: Frediano Ziglio Date: Wed, 27 Jul 2011 20:12:02 +0200 Message-Id: <1311790322-10889-4-git-send-email-freddy77@gmail.com> In-Reply-To: <1311790322-10889-1-git-send-email-freddy77@gmail.com> References: <1311790322-10889-1-git-send-email-freddy77@gmail.com> Subject: [Qemu-devel] [PATCH 3/3] aio: always check paio_init result List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Stefan Hajnoczi Cc: qemu-trivial@nongnu.org, qemu-devel@nongnu.org, Frediano Ziglio Signed-off-by: Frediano Ziglio --- block/raw-posix.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/block/raw-posix.c b/block/raw-posix.c index 275b41e..3c6bd4b 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 -- 1.7.1