commit 5c8d542004b7474560bc4cb017d597ea320bd4ac
author Christian Borntraeger <borntraeger@de.ibm.com> Mon Mar 02 16:27:09 2015 +0100
committer Christian Borntraeger <borntraeger@de.ibm.com> Tue Mar 10 09:26:23 2015 +0100
tree fc98a3e53b156f758e7bcf300af18a43fefa370c
parent 2be9d2927cca76d8475f0083e9ecc87baf1b8222

s390-ccw.img: Reinitialize guessing on reboot

guessed_disk_nature is a static zero variable. As the QEMU ELF
loader does not zero the BSS section, lets do it explicitely here.

This fixes reboot for some corner cases (like FCP flash
devices with logical_block_size=512, physical_block_size=4096)

Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Tested-by: Eugene (jno) Dvurechenski <jno@linux.vnet.ibm.com>
Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Message-Id: <1425310029-53396-3-git-send-email-borntraeger@de.ibm.com>

pc-bios/s390-ccw/virtio.c

diff --git a/pc-bios/s390-ccw/virtio.c b/pc-bios/s390-ccw/virtio.c
index 76919f7..57ff1b0 100644
--- a/pc-bios/s390-ccw/virtio.c
+++ b/pc-bios/s390-ccw/virtio.c
@@ -362,6 +362,7 @@
     struct vq_config_block config = {};
 
     blk_cfg.blk_size = 0; /* mark "illegal" - setup started... */
+    guessed_disk_nature = false;
 
     virtio_reset(schid);