[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH stable-1.1 01/26] virtio-blk: Fix geometry sector ca
From: |
Michael Roth |
Subject: |
[Qemu-devel] [PATCH stable-1.1 01/26] virtio-blk: Fix geometry sector calculation |
Date: |
Fri, 22 Jun 2012 19:33:05 -0500 |
From: Christian Borntraeger <address@hidden>
Currently the sector value for the geometry is masked, even if the
user usesa command line parameter that explicitely gives a number.
This breaks dasd devices on s390. A dasd device can have
a physical block size of 4096 (== same for logical block size)
and a typcial geometry of 15 heads and 12 sectors per cyl.
The ibm partition detection relies on a correct geometry
reported by the device. Unfortunately the current code changes
12 to 8. This would be necessary if the total size is
not a multiple of logical sector size, but for dasd this
is not the case.
This patch checks the device size and only applies sector
mask if necessary.
Signed-off-by: Christian Borntraeger <address@hidden>
CC: Christoph Hellwig <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
hw/virtio-blk.c | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c
index f9e1896..4f57450 100644
--- a/hw/virtio-blk.c
+++ b/hw/virtio-blk.c
@@ -489,7 +489,22 @@ static void virtio_blk_update_config(VirtIODevice *vdev,
uint8_t *config)
stw_raw(&blkcfg.min_io_size, s->conf->min_io_size / blk_size);
stw_raw(&blkcfg.opt_io_size, s->conf->opt_io_size / blk_size);
blkcfg.heads = heads;
- blkcfg.sectors = secs & ~s->sector_mask;
+ /*
+ * We must ensure that the block device capacity is a multiple of
+ * the logical block size. If that is not the case, lets use
+ * sector_mask to adopt the geometry to have a correct picture.
+ * For those devices where the capacity is ok for the given geometry
+ * we dont touch the sector value of the geometry, since some devices
+ * (like s390 dasd) need a specific value. Here the capacity is already
+ * cyls*heads*secs*blk_size and the sector value is not block size
+ * divided by 512 - instead it is the amount of blk_size blocks
+ * per track (cylinder).
+ */
+ if (bdrv_getlength(s->bs) / heads / secs % blk_size) {
+ blkcfg.sectors = secs & ~s->sector_mask;
+ } else {
+ blkcfg.sectors = secs;
+ }
blkcfg.size_max = 0;
blkcfg.physical_block_exp = get_physical_block_exp(s->conf);
blkcfg.alignment_offset = 0;
--
1.7.4.1
- [Qemu-devel] [PATCH stable-1.1 00/26] Initial tree and candidates for stable-1.1, Michael Roth, 2012/06/22
- [Qemu-devel] [PATCH stable-1.1 01/26] virtio-blk: Fix geometry sector calculation,
Michael Roth <=
- [Qemu-devel] [PATCH stable-1.1 02/26] target-xtensa: flush TLB page for new MMU mapping, Michael Roth, 2012/06/22
- [Qemu-devel] [PATCH stable-1.1 03/26] target-xtensa: update EXCVADDR in case of page table lookup, Michael Roth, 2012/06/22
- [Qemu-devel] [PATCH stable-1.1 04/26] target-xtensa: extract TLB entry setting method, Michael Roth, 2012/06/22
- [Qemu-devel] [PATCH stable-1.1 05/26] target-xtensa: update autorefill TLB entries conditionally, Michael Roth, 2012/06/22
- [Qemu-devel] [PATCH stable-1.1 06/26] target-xtensa: control page table lookup explicitly, Michael Roth, 2012/06/22
- [Qemu-devel] [PATCH stable-1.1 07/26] target-xtensa: add MMU pagewalking tests, Michael Roth, 2012/06/22
- [Qemu-devel] [PATCH stable-1.1 08/26] exec: fix TB invalidation after breakpoint insertion/deletion, Michael Roth, 2012/06/22
- [Qemu-devel] [PATCH stable-1.1 09/26] target-xtensa: fix CCOUNT for conditional branches, Michael Roth, 2012/06/22
- [Qemu-devel] [PATCH stable-1.1 10/26] trace/simple.c: fix deprecated glib2 interface, Michael Roth, 2012/06/22
- [Qemu-devel] [PATCH stable-1.1 11/26] configure: report missing libraries for virtfs, Michael Roth, 2012/06/22