From ba5b7ad4495a9788d0af67133186bbc7a553008f Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Wed, 3 Aug 2011 15:08:19 +0200 Subject: [PATCH] block: Declare qemu_blockalign() in block.h, not block_int.h 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 7e3f587feb..8ec409fd18 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 539b4ed895..5dc0074bfc 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 45e95f9e01..1af62b23c6 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 -- 2.11.0