Commit ba5b7ad4 authored by Markus Armbruster's avatar Markus Armbruster Committed by Kevin Wolf
Browse files

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: default avatarMarkus Armbruster <armbru@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 124386cc

block.h

+2 −0
Original line number Diff line number Diff line
@@ -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);

block_int.h

+0 −2
Original line number Diff line number Diff line
@@ -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

hw/sd.c

+0 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 


#include "hw.h"

#include "block.h"

#include "block_int.h"

#include "sd.h"



//#define DEBUG_SD 1