mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-09 18:44:58 -06:00
pc-bios/s390-ccw Improve ECKD informational message
Add block size display to ECKD scheme report. Signed-off-by: Eugene (jno) Dvurechenski <jno@linux.vnet.ibm.com> Reviewed-by: David Hildenbrand <dahi@linux.vnet.ibm.com> Acked-by: Christian Borntraeger <borntraeger@de.ibm.com> Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com> Signed-off-by: Jens Freimann <jfrei@linux.vnet.ibm.com> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
This commit is contained in:
parent
00a47e7e71
commit
b0885f7599
1 changed files with 20 additions and 2 deletions
|
@ -298,6 +298,25 @@ static void ipl_eckd(ECKD_IPL_mode_t mode)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void print_eckd_msg(void)
|
||||||
|
{
|
||||||
|
char msg[] = "Using ECKD scheme (block size *****), ";
|
||||||
|
char *p = &msg[34], *q = &msg[30];
|
||||||
|
int n = virtio_get_block_size();
|
||||||
|
|
||||||
|
/* Fill in the block size and show up the message */
|
||||||
|
if (n > 0 && n <= 99999) {
|
||||||
|
while (n) {
|
||||||
|
*p-- = '0' + (n % 10);
|
||||||
|
n /= 10;
|
||||||
|
}
|
||||||
|
while (p >= q) {
|
||||||
|
*p-- = ' ';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
sclp_print(msg);
|
||||||
|
}
|
||||||
|
|
||||||
/***********************************************************************
|
/***********************************************************************
|
||||||
* IPL a SCSI disk
|
* IPL a SCSI disk
|
||||||
*/
|
*/
|
||||||
|
@ -447,12 +466,11 @@ void zipl_load(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* We have failed to follow the SCSI scheme, so */
|
/* We have failed to follow the SCSI scheme, so */
|
||||||
sclp_print("Using ECKD scheme.\n");
|
|
||||||
if (virtio_guessed_disk_nature()) {
|
if (virtio_guessed_disk_nature()) {
|
||||||
sclp_print("Using guessed DASD geometry.\n");
|
sclp_print("Using guessed DASD geometry.\n");
|
||||||
virtio_assume_eckd();
|
virtio_assume_eckd();
|
||||||
}
|
}
|
||||||
|
print_eckd_msg();
|
||||||
if (magic_match(mbr->magic, IPL1_MAGIC)) {
|
if (magic_match(mbr->magic, IPL1_MAGIC)) {
|
||||||
ipl_eckd(ECKD_CDL); /* no return */
|
ipl_eckd(ECKD_CDL); /* no return */
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue