From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:45708) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QobRT-0004P5-Ua for qemu-devel@nongnu.org; Wed, 03 Aug 2011 09:25:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QobRN-0004tV-Jh for qemu-devel@nongnu.org; Wed, 03 Aug 2011 09:24:59 -0400 Received: from oxygen.pond.sub.org ([78.46.104.156]:50171) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QobRM-0004su-Vd for qemu-devel@nongnu.org; Wed, 03 Aug 2011 09:24:53 -0400 From: Markus Armbruster Date: Wed, 3 Aug 2011 15:08:19 +0200 Message-Id: <1312376904-16115-41-git-send-email-armbru@redhat.com> In-Reply-To: <1312376904-16115-1-git-send-email-armbru@redhat.com> References: <1312376904-16115-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH v2 40/45] block: Declare qemu_blockalign() in block.h, not block_int.h List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, quintela@redhat.com, stefano.stabellini@eu.citrix.com, lcapitulino@redhat.com, hare@suse.de, amit.shah@redhat.com, hch@lst.de Device models should be able to use it without an unclean include of block_int.h. Signed-off-by: Markus Armbruster --- block.h | 2 ++ block_int.h | 2 -- hw/sd.c | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/block.h b/block.h index a8aca5f..3dfd2a4 100644 --- a/block.h +++ b/block.h @@ -269,6 +269,8 @@ int bdrv_img_create(const char *filename, const char *fmt, const char *base_filename, const char *base_fmt, char *options, uint64_t img_size, int flags); +void *qemu_blockalign(BlockDriverState *bs, size_t size); + #define BDRV_SECTORS_PER_DIRTY_CHUNK 2048 void bdrv_set_dirty_tracking(BlockDriverState *bs, int enable); diff --git a/block_int.h b/block_int.h index e5385ba..9a59784 100644 --- a/block_int.h +++ b/block_int.h @@ -221,8 +221,6 @@ void *qemu_aio_get(AIOPool *pool, BlockDriverState *bs, BlockDriverCompletionFunc *cb, void *opaque); void qemu_aio_release(void *p); -void *qemu_blockalign(BlockDriverState *bs, size_t size); - #ifdef _WIN32 int is_windows_drive(const char *filename); #endif diff --git a/hw/sd.c b/hw/sd.c index 24f4af8..3bcfe6a 100644 --- a/hw/sd.c +++ b/hw/sd.c @@ -31,7 +31,6 @@ #include "hw.h" #include "block.h" -#include "block_int.h" #include "sd.h" //#define DEBUG_SD 1 -- 1.7.6