From patchwork Fri Jul 17 14:23:49 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 497180 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id DA4451409F8 for ; Sat, 18 Jul 2015 00:24:31 +1000 (AEST) Received: from localhost ([::1]:45105 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZG6Yv-0004ci-QR for incoming@patchwork.ozlabs.org; Fri, 17 Jul 2015 10:24:29 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55512) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZG6YQ-0003g3-HP for qemu-devel@nongnu.org; Fri, 17 Jul 2015 10:24:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZG6YP-0002zX-P6 for qemu-devel@nongnu.org; Fri, 17 Jul 2015 10:23:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47017) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZG6YM-0002yL-NF; Fri, 17 Jul 2015 10:23:54 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id 649D491588; Fri, 17 Jul 2015 14:23:54 +0000 (UTC) Received: from localhost (ovpn-112-75.ams2.redhat.com [10.36.112.75]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t6HENrRQ026575; Fri, 17 Jul 2015 10:23:53 -0400 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Date: Fri, 17 Jul 2015 15:23:49 +0100 Message-Id: <1437143029-12100-3-git-send-email-stefanha@redhat.com> In-Reply-To: <1437143029-12100-1-git-send-email-stefanha@redhat.com> References: <1437143029-12100-1-git-send-email-stefanha@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Kevin Wolf , Stefan Hajnoczi , Markus Armbruster , qemu-block@nongnu.org Subject: [Qemu-devel] [PATCH v2 2/2] blockdev: always compile in -drive aio= parsing X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org CONFIG_LINUX_AIO is an implementation detail of raw-posix.c. Don't mention CONFIG_LINUX_AIO in blockdev.c. Let raw-posix.c decide what to do with BDRV_O_NATIVE_AIO if CONFIG_LINUX_AIO is not defined. Signed-off-by: Stefan Hajnoczi --- blockdev.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/blockdev.c b/blockdev.c index 62a4586..37b91c8 100644 --- a/blockdev.c +++ b/blockdev.c @@ -405,7 +405,6 @@ static BlockBackend *blockdev_init(const char *file, QDict *bs_opts, bdrv_flags |= BDRV_O_NO_FLUSH; } -#ifdef CONFIG_LINUX_AIO if ((buf = qemu_opt_get(opts, "aio")) != NULL) { if (!strcmp(buf, "native")) { bdrv_flags |= BDRV_O_NATIVE_AIO; @@ -416,7 +415,6 @@ static BlockBackend *blockdev_init(const char *file, QDict *bs_opts, goto early_err; } } -#endif if ((buf = qemu_opt_get(opts, "format")) != NULL) { if (is_help_option(buf)) {