From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:33270) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TUIy7-0006g9-ND for qemu-devel@nongnu.org; Fri, 02 Nov 2012 11:15:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TUIy1-0008T6-K7 for qemu-devel@nongnu.org; Fri, 02 Nov 2012 11:15:35 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:33018) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TUIy1-0008Sn-EI for qemu-devel@nongnu.org; Fri, 02 Nov 2012 11:15:29 -0400 Received: by mail-pb0-f45.google.com with SMTP id rp2so2460111pbb.4 for ; Fri, 02 Nov 2012 08:15:28 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Fri, 2 Nov 2012 16:14:20 +0100 Message-Id: <1351869260-26083-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH] raw-posix: inline paio_ioctl into hdev_aio_ioctl List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: blauwirbel@gmail.com, peter.maydell@linaro.org clang now warns about an unused function: CC block/raw-posix.o block/raw-posix.c:707:26: warning: unused function paio_ioctl [-Wunused-function] static BlockDriverAIOCB *paio_ioctl(BlockDriverState *bs, int fd, ^ 1 warning generated. because the only use of paio_ioctl() is inside a #if defined(__linux__) guard and it is static now. Reported-by: Peter Maydell Signed-off-by: Paolo Bonzini --- block/raw-posix.c | 27 ++++++++++----------------- 1 file modificato, 10 inserzioni(+), 17 rimozioni(-) diff --git a/block/raw-posix.c b/block/raw-posix.c index f2f0404..488e5f5 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -704,22 +704,6 @@ static BlockDriverAIOCB *paio_submit(BlockDriverState *bs, int fd, return thread_pool_submit_aio(aio_worker, acb, cb, opaque); } -static BlockDriverAIOCB *paio_ioctl(BlockDriverState *bs, int fd, - unsigned long int req, void *buf, - BlockDriverCompletionFunc *cb, void *opaque) -{ - RawPosixAIOData *acb = g_slice_new(RawPosixAIOData); - - acb->bs = bs; - acb->aio_type = QEMU_AIO_IOCTL; - acb->aio_fildes = fd; - acb->aio_offset = 0; - acb->aio_ioctl_buf = buf; - acb->aio_ioctl_cmd = req; - - return thread_pool_submit_aio(aio_worker, acb, cb, opaque); -} - static BlockDriverAIOCB *raw_aio_submit(BlockDriverState *bs, int64_t sector_num, QEMUIOVector *qiov, int nb_sectors, BlockDriverCompletionFunc *cb, void *opaque, int type) @@ -1342,10 +1326,19 @@ static BlockDriverAIOCB *hdev_aio_ioctl(BlockDriverState *bs, BlockDriverCompletionFunc *cb, void *opaque) { BDRVRawState *s = bs->opaque; + RawPosixAIOData *acb; if (fd_open(bs) < 0) return NULL; - return paio_ioctl(bs, s->fd, req, buf, cb, opaque); + + acb = g_slice_new(RawPosixAIOData); + acb->bs = bs; + acb->aio_type = QEMU_AIO_IOCTL; + acb->aio_fildes = s->fd; + acb->aio_offset = 0; + acb->aio_ioctl_buf = buf; + acb->aio_ioctl_cmd = req; + return thread_pool_submit_aio(aio_worker, acb, cb, opaque); } #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) -- 1.7.12.1