[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 09/17] block: add host_block_size
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 09/17] block: add host_block_size |
Date: |
Tue, 13 Dec 2011 13:37:12 +0100 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
block.c | 4 +++-
block_int.h | 3 +++
2 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/block.c b/block.c
index 9e8ffb8..91622db 100644
--- a/block.c
+++ b/block.c
@@ -588,6 +588,7 @@ static int bdrv_open_common(BlockDriverState *bs, const
char *filename,
bs->open_flags = open_flags;
bs->growable = 0;
bs->guest_block_size = 512;
+ bs->host_block_size = 512;
assert(bs->copy_on_read == 0); /* bdrv_new() and bdrv_close() make it so */
if ((flags & BDRV_O_RDWR) && (flags & BDRV_O_COPY_ON_READ)) {
@@ -612,6 +613,7 @@ static int bdrv_open_common(BlockDriverState *bs, const
char *filename,
} else {
ret = bdrv_file_open(&bs->file, filename, open_flags);
bs->open_flags = bs->file->open_flags;
+ bs->host_block_size = bs->file->host_block_size;
if (ret >= 0) {
ret = drv->bdrv_open(bs, bs->file->open_flags);
}
@@ -3564,7 +3566,7 @@ void bdrv_set_guest_block_size(BlockDriverState *bs, int
align)
void *qemu_blockalign(BlockDriverState *bs, size_t size)
{
- return qemu_memalign((bs && bs->guest_block_size) ? bs->guest_block_size :
512, size);
+ return qemu_memalign(bs ? bs->host_block_size : 512, size);
}
void bdrv_set_dirty_tracking(BlockDriverState *bs, int enable)
diff --git a/block_int.h b/block_int.h
index 99f29e2..30393a0 100644
--- a/block_int.h
+++ b/block_int.h
@@ -243,6 +243,9 @@ struct BlockDriverState {
/* the memory alignment used by the guest for the buffers handled by this
driver */
int guest_block_size;
+ /* the memory alignment required by the device for the buffers handled by
this driver */
+ int host_block_size;
+
/* NOTE: the following infos are only hints for real hardware
drivers. They are not used by the block driver */
int cyls, heads, secs, translation;
--
1.7.7.1
- [Qemu-devel] [PATCH 00/17] Support mismatched host and guest logical block sizes, Paolo Bonzini, 2011/12/13
- [Qemu-devel] [PATCH 01/17] block: do not rely on open_flags for bdrv_is_snapshot, Paolo Bonzini, 2011/12/13
- [Qemu-devel] [PATCH 02/17] block: store actual flags in bs->open_flags, Paolo Bonzini, 2011/12/13
- [Qemu-devel] [PATCH 05/17] block: remove enable_write_cache, Paolo Bonzini, 2011/12/13
- [Qemu-devel] [PATCH 03/17] block: pass protocol flags up to the format, Paolo Bonzini, 2011/12/13
- [Qemu-devel] [PATCH 04/17] block: non-raw protocols never cache, Paolo Bonzini, 2011/12/13
- [Qemu-devel] [PATCH 06/17] block: move flag bits together, Paolo Bonzini, 2011/12/13
- [Qemu-devel] [PATCH 07/17] raw: remove the aligned_buf, Paolo Bonzini, 2011/12/13
- [Qemu-devel] [PATCH 08/17] block: rename buffer_alignment to guest_block_size, Paolo Bonzini, 2011/12/13
- [Qemu-devel] [PATCH 09/17] block: add host_block_size,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 11/17] iscsi: save host block size, Paolo Bonzini, 2011/12/13
- [Qemu-devel] [PATCH 12/17] block: allow waiting only for overlapping writes, Paolo Bonzini, 2011/12/13
- [Qemu-devel] [PATCH 10/17] raw: probe host_block_size, Paolo Bonzini, 2011/12/13
- [Qemu-devel] [PATCH 16/17] block: default physical block size to host block size, Paolo Bonzini, 2011/12/13
- [Qemu-devel] [PATCH 14/17] block: protect against "torn reads" for guest_block_size > host_block_size, Paolo Bonzini, 2011/12/13
- [Qemu-devel] [PATCH 15/17] block: align and serialize I/O when guest_block_size < host_block_size, Paolo Bonzini, 2011/12/13
- [Qemu-devel] [PATCH 13/17] block: allow waiting at arbitrary granularity, Paolo Bonzini, 2011/12/13
- [Qemu-devel] [PATCH 17/17] qemu-io: add blocksize argument to open, Paolo Bonzini, 2011/12/13
- Re: [Qemu-devel] [PATCH 00/17] Support mismatched host and guest logical block sizes, Kevin Wolf, 2011/12/14