From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51604) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YSSG9-00018N-PU for qemu-devel@nongnu.org; Mon, 02 Mar 2015 10:27:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YSSFy-0006u8-5M for qemu-devel@nongnu.org; Mon, 02 Mar 2015 10:27:53 -0500 Received: from e06smtp15.uk.ibm.com ([195.75.94.111]:34150) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YSSFx-0006tn-S4 for qemu-devel@nongnu.org; Mon, 02 Mar 2015 10:27:42 -0500 Received: from /spool/local by e06smtp15.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 2 Mar 2015 15:27:40 -0000 Received: from b06cxnps4076.portsmouth.uk.ibm.com (d06relay13.portsmouth.uk.ibm.com [9.149.109.198]) by d06dlp02.portsmouth.uk.ibm.com (Postfix) with ESMTP id 83CB72190056 for ; Mon, 2 Mar 2015 15:27:30 +0000 (GMT) Received: from d06av12.portsmouth.uk.ibm.com (d06av12.portsmouth.uk.ibm.com [9.149.37.247]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t22FRcnj60555468 for ; Mon, 2 Mar 2015 15:27:38 GMT Received: from d06av12.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av12.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t22FRa50020715 for ; Mon, 2 Mar 2015 08:27:37 -0700 From: Christian Borntraeger Date: Mon, 2 Mar 2015 16:27:58 +0100 Message-Id: <1425310078-53805-3-git-send-email-borntraeger@de.ibm.com> In-Reply-To: <1425310078-53805-1-git-send-email-borntraeger@de.ibm.com> References: <1425310078-53805-1-git-send-email-borntraeger@de.ibm.com> Subject: [Qemu-devel] [PATCH/RFC 2/2] s390-ccw.img: Reinitialize guessing on reboot List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alexander Graf Cc: Cornelia Huck , Christian Borntraeger , Jens Freimann , qemu-devel , Thomas Huth 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 Tested-by: Eugene (jno) Dvurechenski Reviewed-by: Cornelia Huck --- pc-bios/s390-ccw/virtio.c | 1 + 1 file changed, 1 insertion(+) diff --git a/pc-bios/s390-ccw/virtio.c b/pc-bios/s390-ccw/virtio.c index 4dc91a7..bdf5810 100644 --- a/pc-bios/s390-ccw/virtio.c +++ b/pc-bios/s390-ccw/virtio.c @@ -362,6 +362,7 @@ void virtio_setup_block(struct subchannel_id schid) struct vq_config_block config = {}; blk_cfg.blk_size = 0; /* mark "illegal" - setup started... */ + guessed_disk_nature = false; virtio_reset(schid); -- 2.3.0