From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:36456) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TEi4Z-0005fg-PS for qemu-devel@nongnu.org; Thu, 20 Sep 2012 10:49:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TEi4N-0000dr-2Q for qemu-devel@nongnu.org; Thu, 20 Sep 2012 10:49:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39811) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TEi4M-0000dh-R6 for qemu-devel@nongnu.org; Thu, 20 Sep 2012 10:49:35 -0400 Message-ID: <505B2CF7.5020602@redhat.com> Date: Thu, 20 Sep 2012 10:49:27 -0400 From: Jeff Cody MIME-Version: 1.0 References: <1c38c5ca7393821314d988235d7476141bdf3882.1347993885.git.jcody@redhat.com> <505B16C4.6090401@redhat.com> In-Reply-To: <505B16C4.6090401@redhat.com> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v3 04/19] block: move aio initialization into a helper function Reply-To: jcody@redhat.com List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Kevin Wolf Cc: supriyak@linux.vnet.ibm.com, pbonzini@redhat.com, eblake@redhat.com, qemu-devel@nongnu.org, stefanha@gmail.com On 09/20/2012 09:14 AM, Kevin Wolf wrote: > Am 18.09.2012 20:53, schrieb Jeff Cody: >> Move AIO initialization for raw-posix block driver into a helper function. >> >> In addition to just code motion, the aio_ctx pointer is checked for NULL, >> prior to calling laio_init(), to make sure laio_init() is only run once. >> >> Signed-off-by: Jeff Cody >> --- >> block/raw-posix.c | 55 +++++++++++++++++++++++++++++++++++-------------------- >> 1 file changed, 35 insertions(+), 20 deletions(-) >> >> diff --git a/block/raw-posix.c b/block/raw-posix.c >> index 6be20b1..ee55f79 100644 >> --- a/block/raw-posix.c >> +++ b/block/raw-posix.c >> @@ -185,6 +185,40 @@ static int raw_normalize_devicepath(const char **filename) >> } >> #endif >> >> +static int raw_set_aio(void **aio_ctx, int *use_aio, int bdrv_flags) >> +{ >> +#ifdef CONFIG_LINUX_AIO >> + int ret = -1; >> + assert(aio_ctx != NULL); >> + assert(use_aio != NULL); >> + /* >> + * Currently Linux do AIO only for files opened with O_DIRECT >> + * specified so check NOCACHE flag too >> + */ >> + if ((bdrv_flags & (BDRV_O_NOCACHE|BDRV_O_NATIVE_AIO)) == >> + (BDRV_O_NOCACHE|BDRV_O_NATIVE_AIO)) { >> + >> + /* if non-NULL, laio_init() has already been run */ >> + if (*aio_ctx == NULL) { >> + *aio_ctx = laio_init(); >> + if (!*aio_ctx) { >> + goto error; >> + } >> + } >> + *use_aio = 1; >> + } else { >> + *use_aio = 0; >> + } >> + >> + ret = 0; >> + >> +error: >> + return ret; >> +#else >> + return 0; >> +#endif >> +} >> + >> static int raw_open_common(BlockDriverState *bs, const char *filename, >> int bdrv_flags, int open_flags) >> { >> @@ -239,26 +273,7 @@ static int raw_open_common(BlockDriverState *bs, const char *filename, >> goto out_free_buf; >> } >> >> -#ifdef CONFIG_LINUX_AIO >> - /* >> - * Currently Linux do AIO only for files opened with O_DIRECT >> - * specified so check NOCACHE flag too >> - */ >> - if ((bdrv_flags & (BDRV_O_NOCACHE|BDRV_O_NATIVE_AIO)) == >> - (BDRV_O_NOCACHE|BDRV_O_NATIVE_AIO)) { >> - >> - s->aio_ctx = laio_init(); >> - if (!s->aio_ctx) { >> - goto out_free_buf; >> - } >> - s->use_aio = 1; >> - } else >> -#endif >> - { >> -#ifdef CONFIG_LINUX_AIO >> - s->use_aio = 0; >> -#endif >> - } >> + raw_set_aio(&s->aio_ctx, &s->use_aio, bdrv_flags); > > This should check the return value to handle laio_init() failure properly. > > Kevin > Thanks, fixed for v4.