david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

raw-posix: Always check paio_init result

Browse Source 
Signed-off-by: Frediano Ziglio <freddy77@gmail.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Frediano Ziglio 2011-07-27 20:12:02 +02:00 committed by Kevin Wolf
parent c1ee7d56f3
commit f6e8ffc22f
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
block/raw-posix.c
View File

@ -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 #ifdef CONFIG_LINUX_AIO
if ((bdrv_flags & (BDRV_O_NOCACHE|BDRV_O_NATIVE_AIO)) == if ((bdrv_flags & (BDRV_O_NOCACHE|BDRV_O_NATIVE_AIO)) ==
(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(); s->aio_ctx = laio_init();
if (!s->aio_ctx) { if (!s->aio_ctx) {
goto out_free_buf; goto out_free_buf;
@ -245,9 +247,6 @@ static int raw_open_common(BlockDriverState *bs, const char *filename,
} else } else
#endif #endif
{ {
if (paio_init() < 0) {
goto out_free_buf;
}
#ifdef CONFIG_LINUX_AIO #ifdef CONFIG_LINUX_AIO
s->use_aio = 0; s->use_aio = 0;
#endif #endif