From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:55084) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R0xiG-00022D-TM for qemu-devel@nongnu.org; Tue, 06 Sep 2011 11:37:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R0xi5-0003nW-G2 for qemu-devel@nongnu.org; Tue, 06 Sep 2011 11:37:19 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38686) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R0xi4-0003mo-Px for qemu-devel@nongnu.org; Tue, 06 Sep 2011 11:37:13 -0400 From: Kevin Wolf Date: Tue, 6 Sep 2011 17:39:33 +0200 Message-Id: <1315323586-23840-19-git-send-email-kwolf@redhat.com> In-Reply-To: <1315323586-23840-1-git-send-email-kwolf@redhat.com> References: <1315323586-23840-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 18/31] block: Declare qemu_blockalign() in block.h, not block_int.h List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Markus Armbruster Device models should be able to use it without an unclean include of block_int.h. Signed-off-by: Markus Armbruster Signed-off-by: Kevin Wolf --- 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 7e3f587..8ec409f 100644 --- a/block.h +++ b/block.h @@ -258,6 +258,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 539b4ed..5dc0074 100644 --- a/block_int.h +++ b/block_int.h @@ -224,8 +224,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 45e95f9..1af62b2 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