From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54721) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZmNjp-0001wS-AH for qemu-devel@nongnu.org; Wed, 14 Oct 2015 11:13:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZmNjj-0004Hb-C3 for qemu-devel@nongnu.org; Wed, 14 Oct 2015 11:13:08 -0400 Date: Wed, 14 Oct 2015 17:12:50 +0200 From: Kevin Wolf Message-ID: <20151014151250.GD16803@noname.str.redhat.com> References: <1444680042-13207-1-git-send-email-mreitz@redhat.com> <1444680042-13207-26-git-send-email-mreitz@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1444680042-13207-26-git-send-email-mreitz@redhat.com> Subject: Re: [Qemu-devel] [PATCH v6 25/39] blockdev: Pull out blockdev option extraction List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Max Reitz Cc: Alberto Garcia , qemu-block@nongnu.org, John Snow , qemu-devel@nongnu.org, Markus Armbruster , Stefan Hajnoczi Am 12.10.2015 um 22:00 hat Max Reitz geschrieben: > Extract some of the blockdev option extraction code from blockdev_init() > into its own function. This simplifies blockdev_init() and will allow > reusing the code in a different function added in a follow-up patch. > > Signed-off-by: Max Reitz > Reviewed-by: Alberto Garcia Reviewed-by: Kevin Wolf > +#ifdef CONFIG_LINUX_AIO > + if ((aio = qemu_opt_get(opts, "aio")) != NULL) { > + if (!strcmp(aio, "native")) { > + *bdrv_flags |= BDRV_O_NATIVE_AIO; > + } else if (!strcmp(aio, "threads")) { > + /* this is the default */ > + } else { > + error_setg(errp, "invalid aio option"); > + return; > + } > + } > +#endif Unrelated to your patch, but didn't we want to remove this #ifdef? I thought we had already done so... Oh, I've never flushed block-next after the 2.4 release. :-/ Expect a merge conflict coming up here... Kevin