[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 49/55] block: Declare qemu_blockalign() in block.h,
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 49/55] block: Declare qemu_blockalign() in block.h, not block_int.h |
Date: |
Wed, 20 Jul 2011 18:24:23 +0200 |
Device models should be able to use it without an unclean include of
block_int.h.
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 b6eaaba..8f52abb 100644
--- a/block.h
+++ b/block.h
@@ -264,6 +264,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 7e74d01..768c842 100644
--- a/block_int.h
+++ b/block_int.h
@@ -213,8 +213,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 4dc9047..fdd87b0 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.2.3
- [Qemu-devel] [PATCH 17/55] ide/atapi: Switch from BlockDriverState's tray_open to own, (continued)
- [Qemu-devel] [PATCH 17/55] ide/atapi: Switch from BlockDriverState's tray_open to own, Markus Armbruster, 2011/07/20
- [Qemu-devel] [PATCH 19/55] scsi-disk: Factor out scsi_disk_emulate_start_stop(), Markus Armbruster, 2011/07/20
- [Qemu-devel] [PATCH 02/55] block: Reset device model callbacks on detach, Markus Armbruster, 2011/07/20
- [Qemu-devel] [PATCH 36/55] ide: Give vmstate structs internal linkage where possible, Markus Armbruster, 2011/07/20
- [Qemu-devel] [PATCH 20/55] scsi-disk: Track tray open/close state, Markus Armbruster, 2011/07/20
- [Qemu-devel] [PATCH 49/55] block: Declare qemu_blockalign() in block.h, not block_int.h,
Markus Armbruster <=
- [Qemu-devel] [PATCH 50/55] block: New bdrv_set_buffer_alignment(), Markus Armbruster, 2011/07/20
- [Qemu-devel] [PATCH 52/55] block: Move BlockDriverAIOCB & friends from block_int.h to block.h, Markus Armbruster, 2011/07/20
- [Qemu-devel] [PATCH 38/55] scsi-disk: Preserve tray state on migration, Markus Armbruster, 2011/07/20