From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:56569) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Syho0-0003EC-Np for qemu-devel@nongnu.org; Tue, 07 Aug 2012 07:18:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Syhnu-0006ia-5L for qemu-devel@nongnu.org; Tue, 07 Aug 2012 07:18:32 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:37528) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Syhnt-0006Zk-TT for qemu-devel@nongnu.org; Tue, 07 Aug 2012 07:18:26 -0400 Received: by mail-pb0-f45.google.com with SMTP id ro12so6760377pbb.4 for ; Tue, 07 Aug 2012 04:18:25 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 7 Aug 2012 13:17:26 +0200 Message-Id: <1344338247-17567-12-git-send-email-pbonzini@redhat.com> In-Reply-To: <1344338247-17567-1-git-send-email-pbonzini@redhat.com> References: <1344338247-17567-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH v2 11/12] raw-posix: rename raw-posix-aio.h, hide unavailable prototypes List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@linux.vnet.ibm.com, stefanha@linux.vnet.ibm.com, sw@weilnetz.de Signed-off-by: Paolo Bonzini --- block/{raw-posix-aio.h => raw-aio.h} | 10 ++++++---- block/raw-posix.c | 2 +- linux-aio.c | 2 +- 3 file modificati, 8 inserzioni(+), 6 rimozioni(-) rename block/{raw-posix-aio.h => raw-aio.h} (86%) diff --git a/block/raw-posix-aio.h b/block/raw-aio.h similarity index 86% rename from block/raw-posix-aio.h rename to block/raw-aio.h index c714367..b3bb073 100644 --- a/block/raw-posix-aio.h +++ b/block/raw-aio.h @@ -1,5 +1,5 @@ /* - * QEMU Posix block I/O backend AIO support + * Declarations for AIO in the raw protocol * * Copyright IBM, Corp. 2008 * @@ -12,8 +12,8 @@ * Contributions after 2012-01-13 are licensed under the terms of the * GNU GPL, version 2 or (at your option) any later version. */ -#ifndef QEMU_RAW_POSIX_AIO_H -#define QEMU_RAW_POSIX_AIO_H +#ifndef QEMU_RAW_AIO_H +#define QEMU_RAW_AIO_H /* AIO request types */ #define QEMU_AIO_READ 0x0001 @@ -28,9 +28,11 @@ /* linux-aio.c - Linux native implementation */ +#ifdef CONFIG_LINUX_AIO void *laio_init(void); BlockDriverAIOCB *laio_submit(BlockDriverState *bs, void *aio_ctx, int fd, int64_t sector_num, QEMUIOVector *qiov, int nb_sectors, BlockDriverCompletionFunc *cb, void *opaque, int type); +#endif -#endif /* QEMU_RAW_POSIX_AIO_H */ +#endif /* QEMU_RAW_AIO_H */ diff --git a/block/raw-posix.c b/block/raw-posix.c index 00712dd..4286bef 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -29,7 +29,7 @@ #include "trace.h" #include "thread-pool.h" #include "iov.h" -#include "block/raw-posix-aio.h" +#include "raw-aio.h" #if defined(__APPLE__) && (__MACH__) #include diff --git a/linux-aio.c b/linux-aio.c index 769b558..06f6790 100644 --- a/linux-aio.c +++ b/linux-aio.c @@ -9,7 +9,7 @@ */ #include "qemu-common.h" #include "qemu-aio.h" -#include "block/raw-posix-aio.h" +#include "block/raw-aio.h" #include "event_notifier.h" #include -- 1.7.11.2