]> rtime.felk.cvut.cz Git - lisovros/qemu_apohw.git/commit
scsi: Change scsi sense buf size to 252
authorFam Zheng <famz@redhat.com>
Fri, 24 Jan 2014 07:02:24 +0000 (15:02 +0800)
committerPaolo Bonzini <pbonzini@redhat.com>
Sat, 22 Feb 2014 09:02:23 +0000 (10:02 +0100)
commitc5f52875b980e54e6bebad6121c76863356e1d7f
treefac93c60d411417740faf5e9a9509141b1097438
parent6141f3bd6904df7cf9519c6444a14a608b9874c4
scsi: Change scsi sense buf size to 252

Current buffer size fails the assersion check in like

    hw/scsi/scsi-bus.c:1655:    assert(req->sense_len <= sizeof(req->sense));

when backend (block/iscsi.c) returns more data then 96.

Exercise the core dump path by booting an Gentoo ISO with scsi-generic
device backed with iscsi (built with libiscsi 1.7.0):

    x86_64-softmmu/qemu-system-x86_64 \
    -drive file=iscsi://localhost:3260/iqn.foobar/0,if=none,id=drive-disk \
    -device virtio-scsi-pci,id=scsi1,bus=pci.0,addr=0x6 \
    -device scsi-generic,drive=drive-disk,bus=scsi1.0,id=iscsi-disk \
    -boot d \
    -cdrom gentoo.iso

    qemu-system-x86_64: hw/scsi/scsi-bus.c:1655: scsi_req_complete:
    Assertion `req->sense_len <= sizeof(req->sense)' failed.

According to SPC-4, section 4.5.2.1, 252 is the limit of sense data. So
increase the value to fix it.

Also remove duplicated define for the macro.

Signed-off-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Benoit Canet <benoit@irqsave.net>
Cc: qemu-stable@nongnu.org
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
hw/scsi/scsi-generic.c
hw/scsi/spapr_vscsi.c
include/hw/scsi/scsi.h