[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 12/38] block: Move guest_block_size into BlockBac
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v3 12/38] block: Move guest_block_size into BlockBackend |
Date: |
Wed, 3 Jun 2015 21:43:53 +0200 |
guest_block_size is a guest device property so it should be moved into
the interface between block layer and guest devices, which is the
BlockBackend.
Signed-off-by: Max Reitz <address@hidden>
---
block.c | 7 -------
block/block-backend.c | 7 +++++--
include/block/block.h | 1 -
include/block/block_int.h | 3 ---
4 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/block.c b/block.c
index f9596e3..dbfd4c7 100644
--- a/block.c
+++ b/block.c
@@ -815,7 +815,6 @@ static int bdrv_open_common(BlockDriverState *bs,
BlockDriverState *file,
}
bs->open_flags = flags;
- bs->guest_block_size = 512;
bs->request_alignment = 512;
bs->zero_beyond_eof = true;
open_flags = bdrv_open_flags(bs, flags);
@@ -1816,7 +1815,6 @@ static void bdrv_move_feature_fields(BlockDriverState
*bs_dest,
/* move some fields that need to stay attached to the device */
/* dev info */
- bs_dest->guest_block_size = bs_src->guest_block_size;
bs_dest->copy_on_read = bs_src->copy_on_read;
bs_dest->enable_write_cache = bs_src->enable_write_cache;
@@ -3050,11 +3048,6 @@ void bdrv_lock_medium(BlockDriverState *bs, bool locked)
}
}
-void bdrv_set_guest_block_size(BlockDriverState *bs, int align)
-{
- bs->guest_block_size = align;
-}
-
BdrvDirtyBitmap *bdrv_find_dirty_bitmap(BlockDriverState *bs, const char *name)
{
BdrvDirtyBitmap *bm;
diff --git a/block/block-backend.c b/block/block-backend.c
index 161f3d7..163d329 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -31,6 +31,9 @@ struct BlockBackend {
/* TODO change to DeviceState when all users are qdevified */
const BlockDevOps *dev_ops;
void *dev_opaque;
+
+ /* the block size for which the guest device expects atomicity */
+ int guest_block_size;
};
typedef struct BlockBackendAIOCB {
@@ -334,7 +337,7 @@ void blk_detach_dev(BlockBackend *blk, void *dev)
blk->dev = NULL;
blk->dev_ops = NULL;
blk->dev_opaque = NULL;
- bdrv_set_guest_block_size(blk->bs, 512);
+ blk->guest_block_size = 512;
blk_unref(blk);
}
@@ -784,7 +787,7 @@ int blk_get_max_transfer_length(BlockBackend *blk)
void blk_set_guest_block_size(BlockBackend *blk, int align)
{
- bdrv_set_guest_block_size(blk->bs, align);
+ blk->guest_block_size = align;
}
void *blk_blockalign(BlockBackend *blk, size_t size)
diff --git a/include/block/block.h b/include/block/block.h
index 8145fe5..e6a8610 100644
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -443,7 +443,6 @@ void bdrv_img_create(const char *filename, const char *fmt,
size_t bdrv_min_mem_align(BlockDriverState *bs);
/* Returns optimal alignment in bytes for bounce buffer */
size_t bdrv_opt_mem_align(BlockDriverState *bs);
-void bdrv_set_guest_block_size(BlockDriverState *bs, int align);
void *qemu_blockalign(BlockDriverState *bs, size_t size);
void *qemu_blockalign0(BlockDriverState *bs, size_t size);
void *qemu_try_blockalign(BlockDriverState *bs, size_t size);
diff --git a/include/block/block_int.h b/include/block/block_int.h
index 7f4d796..956112e 100644
--- a/include/block/block_int.h
+++ b/include/block/block_int.h
@@ -395,9 +395,6 @@ struct BlockDriverState {
/* Alignment requirement for offset/length of I/O requests */
unsigned int request_alignment;
- /* the block size for which the guest device expects atomicity */
- int guest_block_size;
-
/* do we need to tell the quest if we have a volatile write cache? */
int enable_write_cache;
--
2.4.1
- [Qemu-devel] [PATCH v3 07/38] block/quorum: Implement bdrv_is_inserted(), (continued)
- [Qemu-devel] [PATCH v3 07/38] block/quorum: Implement bdrv_is_inserted(), Max Reitz, 2015/06/03
- [Qemu-devel] [PATCH v3 10/38] hw/usb-storage: Check whether BB is inserted, Max Reitz, 2015/06/03
- [Qemu-devel] [PATCH v3 09/38] hw/block/fdc: Implement tray status, Max Reitz, 2015/06/03
- [Qemu-devel] [PATCH v3 11/38] block: Fix BB AIOCB AioContext without BDS, Max Reitz, 2015/06/03
- [Qemu-devel] [PATCH v3 12/38] block: Move guest_block_size into BlockBackend,
Max Reitz <=
- [Qemu-devel] [PATCH v3 13/38] block: Remove wr_highest_sector from BlockAcctStats, Max Reitz, 2015/06/03
- [Qemu-devel] [PATCH v3 14/38] block: Move BlockAcctStats into BlockBackend, Max Reitz, 2015/06/03
- Re: [Qemu-devel] [Qemu-block] [PATCH v3 14/38] block: Move BlockAcctStats into BlockBackend, Alberto Garcia, 2015/06/05