From patchwork Mon Jul 15 14:43:02 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 259068 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)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C866C2C014C for ; Tue, 16 Jul 2013 00:49:47 +1000 (EST) Received: from localhost ([::1]:48024 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uyk5x-00018b-O2 for incoming@patchwork.ozlabs.org; Mon, 15 Jul 2013 10:49:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58097) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uyk1N-0002Sm-EW for qemu-devel@nongnu.org; Mon, 15 Jul 2013 10:45:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Uyk1G-0002Qd-Qg for qemu-devel@nongnu.org; Mon, 15 Jul 2013 10:45:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57320) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uyk1G-0002Pa-HJ for qemu-devel@nongnu.org; Mon, 15 Jul 2013 10:44:54 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r6FEiqda018949 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 15 Jul 2013 10:44:53 -0400 Received: from localhost (ovpn-112-19.ams2.redhat.com [10.36.112.19]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r6FEinYh005070; Mon, 15 Jul 2013 10:44:51 -0400 From: Stefan Hajnoczi To: Date: Mon, 15 Jul 2013 22:43:02 +0800 Message-Id: <1373899382-13514-14-git-send-email-stefanha@redhat.com> In-Reply-To: <1373899382-13514-1-git-send-email-stefanha@redhat.com> References: <1373899382-13514-1-git-send-email-stefanha@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Kevin Wolf , Paolo Bonzini , Stefan Hajnoczi Subject: [Qemu-devel] [PATCH v2 13/13] block: drop raw_get_aio_fd() 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 virtio-blk data plane only worked with -drive format=raw,aio=native. It used raw_get_aio_fd() to fetch the file descriptor from raw-posix. This was a layering violation and is no longer necessary now that virtio-blk data plane uses the QEMU block layer. Signed-off-by: Stefan Hajnoczi --- block/raw-posix.c | 34 ---------------------------------- include/block/block.h | 8 -------- 2 files changed, 42 deletions(-) diff --git a/block/raw-posix.c b/block/raw-posix.c index e8eb396..116b4d3 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -1903,40 +1903,6 @@ static BlockDriver bdrv_host_cdrom = { }; #endif /* __FreeBSD__ */ -#ifdef CONFIG_LINUX_AIO -/** - * Return the file descriptor for Linux AIO - * - * This function is a layering violation and should be removed when it becomes - * possible to call the block layer outside the global mutex. It allows the - * caller to hijack the file descriptor so I/O can be performed outside the - * block layer. - */ -int raw_get_aio_fd(BlockDriverState *bs) -{ - BDRVRawState *s; - - if (!bs->drv) { - return -ENOMEDIUM; - } - - if (bs->drv == bdrv_find_format("raw")) { - bs = bs->file; - } - - /* raw-posix has several protocols so just check for raw_aio_readv */ - if (bs->drv->bdrv_aio_readv != raw_aio_readv) { - return -ENOTSUP; - } - - s = bs->opaque; - if (!s->use_aio) { - return -ENOTSUP; - } - return s->fd; -} -#endif /* CONFIG_LINUX_AIO */ - static void bdrv_file_init(void) { /* diff --git a/include/block/block.h b/include/block/block.h index 977d5f6..cb44f27 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -365,14 +365,6 @@ void bdrv_disable_copy_on_read(BlockDriverState *bs); void bdrv_set_in_use(BlockDriverState *bs, int in_use); int bdrv_in_use(BlockDriverState *bs); -#ifdef CONFIG_LINUX_AIO -int raw_get_aio_fd(BlockDriverState *bs); -#else -static inline int raw_get_aio_fd(BlockDriverState *bs) -{ - return -ENOTSUP; -} -#endif enum BlockAcctType { BDRV_ACCT_READ,