Commit 99efaa26 authored by Thomas Huth's avatar Thomas Huth Committed by Cornelia Huck
Browse files

hw/s390x/ipl: Fix crash with virtio-scsi-pci device 



qemu-system-s390x currently crashes when it is started with a
virtio-scsi-pci device, e.g.:

 qemu-system-s390x -nographic -enable-kvm -device virtio-scsi-pci \
                   -drive file=/tmp/disk.dat,if=none,id=d1,format=raw \
                   -device scsi-cd,drive=d1,bootindex=1

The problem is that the code in s390_gen_initial_iplb() currently assumes
that all SCSI devices are also CCW devices, which is not the case for
virtio-scsi-pci of course. Fix it by adding an appropriate check for
TYPE_CCW_DEVICE here.

Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Message-Id: <1493126327-13162-1-git-send-email-thuth@redhat.com>
Reviewed-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
parent c55144ec

hw/s390x/ipl.c

+7 −1
Original line number Diff line number Diff line
@@ -249,7 +249,13 @@ static bool s390_gen_initial_iplb(S390IPLState *ipl) 
            SCSIBus *bus = scsi_bus_from_device(sd);

            VirtIOSCSI *vdev = container_of(bus, VirtIOSCSI, bus);

            VirtIOSCSICcw *scsi_ccw = container_of(vdev, VirtIOSCSICcw, vdev);

            CcwDevice *ccw_dev = CCW_DEVICE(scsi_ccw);

            CcwDevice *ccw_dev;



            ccw_dev = (CcwDevice *)object_dynamic_cast(OBJECT(scsi_ccw),

                                                       TYPE_CCW_DEVICE);

            if (!ccw_dev) {       /* It might be a PCI device instead */

                return false;

            }



            ipl->iplb.len = cpu_to_be32(S390_IPLB_MIN_QEMU_SCSI_LEN);

            ipl->iplb.blk0_len =