From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:49957) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QocAq-00012l-AP for qemu-devel@nongnu.org; Wed, 03 Aug 2011 10:11:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QocAo-0007ig-Ls for qemu-devel@nongnu.org; Wed, 03 Aug 2011 10:11:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:65075) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QocAo-0007hs-BY for qemu-devel@nongnu.org; Wed, 03 Aug 2011 10:11:50 -0400 From: Kevin Wolf Date: Wed, 3 Aug 2011 16:14:10 +0200 Message-Id: <1312380864-15605-16-git-send-email-kwolf@redhat.com> In-Reply-To: <1312380864-15605-1-git-send-email-kwolf@redhat.com> References: <1312380864-15605-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 15/29] raw-posix: Always check paio_init result List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Frediano Ziglio Signed-off-by: Frediano Ziglio Signed-off-by: Kevin Wolf --- 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 6dd7086..c5c9944 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.6