[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 06/19] pc-bios/s390-ccw: handle more ECKD DASD block
From: |
Christian Borntraeger |
Subject: |
[Qemu-devel] [PULL 06/19] pc-bios/s390-ccw: handle more ECKD DASD block sizes |
Date: |
Mon, 1 Sep 2014 14:54:17 +0200 |
From: "Eugene (jno) Dvurechenski" <address@hidden>
Using dasdfmt(8) to format a DASD allows to choose a block size.
There are four supported values: 512, 1024, 2048, and 4096 bytes
per block. Each block size leads to selection of new count of
sectors per track. The head count remains always the same: 15.
This empiric knowledge is used to detect ECKD DASD to IPL from.
Signed-off-by: Eugene (jno) Dvurechenski <address@hidden>
Reviewed-by: David Hildenbrand <address@hidden>
Acked-by: Christian Borntraeger <address@hidden>
Signed-off-by: Jens Freimann <address@hidden>
Signed-off-by: Christian Borntraeger <address@hidden>
---
pc-bios/s390-ccw/virtio.c | 27 ++++++++++++++++++++++++---
1 file changed, 24 insertions(+), 3 deletions(-)
diff --git a/pc-bios/s390-ccw/virtio.c b/pc-bios/s390-ccw/virtio.c
index 04977e4..6ed3dc9 100644
--- a/pc-bios/s390-ccw/virtio.c
+++ b/pc-bios/s390-ccw/virtio.c
@@ -299,14 +299,35 @@ bool virtio_disk_is_scsi(void)
&& (virtio_get_block_size() == 512);
}
+/*
+ * Other supported value pairs, if any, would need to be added here.
+ * Note: head count is always 15.
+ */
+static inline u8 virtio_eckd_sectors_for_block_size(int size)
+{
+ switch (size) {
+ case 512:
+ return 49;
+ case 1024:
+ return 33;
+ case 2048:
+ return 21;
+ case 4096:
+ return 12;
+ }
+ return 0;
+}
+
bool virtio_disk_is_eckd(void)
{
+ const int block_size = virtio_get_block_size();
+
if (guessed_disk_nature) {
- return (virtio_get_block_size() == 4096);
+ return (block_size == 4096);
}
return (blk_cfg.geometry.heads == 15)
- && (blk_cfg.geometry.sectors == 12)
- && (virtio_get_block_size() == 4096);
+ && (blk_cfg.geometry.sectors ==
+ virtio_eckd_sectors_for_block_size(block_size));
}
bool virtio_ipl_disk_is_valid(void)
--
1.8.4.2
- [Qemu-devel] [PULL 10/19] pc-bios/s390-ccw: Do proper console setup, (continued)
- [Qemu-devel] [PULL 10/19] pc-bios/s390-ccw: Do proper console setup, Christian Borntraeger, 2014/09/01
- [Qemu-devel] [PULL 09/19] pc-bios/s390-ccw: IPL from DASD with format variations, Christian Borntraeger, 2014/09/01
- [Qemu-devel] [PULL 07/19] pc-bios/s390-ccw Improve ECKD informational message, Christian Borntraeger, 2014/09/01
- [Qemu-devel] [PULL 04/19] s390x/kvm: execute the first cpu reset on the vcpu thread, Christian Borntraeger, 2014/09/01
- [Qemu-devel] [PULL 14/19] s390-virtio: Apply same memory boundaries as virtio-ccw, Christian Borntraeger, 2014/09/01
- [Qemu-devel] [PULL 16/19] s390x/gdb: don't touch the cc if tcg is not enabled, Christian Borntraeger, 2014/09/01
- [Qemu-devel] [PULL 05/19] pc-bios/s390-ccw: support all virtio block size, Christian Borntraeger, 2014/09/01
- [Qemu-devel] [PULL 13/19] virtio-ccw: Include standby memory when calculating storage increment, Christian Borntraeger, 2014/09/01
- [Qemu-devel] [PULL 11/19] pc-bios/s390-ccw.img binary update, Christian Borntraeger, 2014/09/01
- [Qemu-devel] [PULL 15/19] sclp-s390: Add memory hotplug SCLPs, Christian Borntraeger, 2014/09/01
- [Qemu-devel] [PULL 06/19] pc-bios/s390-ccw: handle more ECKD DASD block sizes,
Christian Borntraeger <=
- [Qemu-devel] [PULL 08/19] pc-bios/s390-ccw Really big EAV ECKD DASD handling, Christian Borntraeger, 2014/09/01
- [Qemu-devel] [PULL 17/19] s390x/gdb: add the feature xml files for s390x, Christian Borntraeger, 2014/09/01
- [Qemu-devel] [PULL 18/19] s390x/gdb: generate target.xml and handle fp/ac as coprocessors, Christian Borntraeger, 2014/09/01
- [Qemu-devel] [PULL 12/19] sclp-s390: Add device to manage s390 memory hotplug, Christian Borntraeger, 2014/09/01
- [Qemu-devel] [PULL 19/19] s390x/gdb: coding style fixes, Christian Borntraeger, 2014/09/01
- Re: [Qemu-devel] [PULL 00/19] s390x/kvm: Several updates/fixes/features, Peter Maydell, 2014/09/01