Re: [Qemu-devel] [PATCH v2 40/45] block: Declare qemu_blockalign() in block.h, not block_int.h

[Luiz Capitulino]

On Wed,  3 Aug 2011 15:08:19 +0200
Markus Armbruster <address@hidden> wrote:

> Device models should be able to use it without an unclean include of
> block_int.h.

Nitpick: I'd do the prototype move after patch 38/45 and include the
block_int.h removal in the patch you're trimming block_int.h includes.

> 
> Signed-off-by: Markus Armbruster <address@hidden>
> ---
>  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