[Qemu-commits] [qemu/qemu] c5f528: scsi: Change scsi sense buf size to 252

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: c5f52875b980e54e6bebad6121c76863356e1d7f
      
https://github.com/qemu/qemu/commit/c5f52875b980e54e6bebad6121c76863356e1d7f
  Author: Fam Zheng <address@hidden>
  Date:   2014-02-22 (Sat, 22 Feb 2014)

  Changed paths:
    M hw/scsi/scsi-generic.c
    M hw/scsi/spapr_vscsi.c
    M include/hw/scsi/scsi.h

  Log Message:
  -----------
  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 <address@hidden>
Reviewed-by: Benoit Canet <address@hidden>
Cc: address@hidden
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 703dd81aca15ef1d91dba013b6b66c6e3ff88628
      
https://github.com/qemu/qemu/commit/703dd81aca15ef1d91dba013b6b66c6e3ff88628
  Author: Paolo Bonzini <address@hidden>
  Date:   2014-02-22 (Sat, 22 Feb 2014)

  Changed paths:
    M hw/scsi/scsi-bus.c
    M hw/scsi/scsi-disk.c
    M include/hw/scsi/scsi.h

  Log Message:
  -----------
  scsi: report thin provisioning errors with werror=report

SCSI defines a status code for when a thin-provisioned LUNs would
exceed the allocated space, map ENOSPC to it.

Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 7ef8cf9a0861b6f67f5e57428478c31bfd811651
      
https://github.com/qemu/qemu/commit/7ef8cf9a0861b6f67f5e57428478c31bfd811651
  Author: Markus Armbruster <address@hidden>
  Date:   2014-02-22 (Sat, 22 Feb 2014)

  Changed paths:
    M hw/scsi/scsi-bus.c

  Log Message:
  -----------
  scsi-bus: Fix transfer length for VERIFY with BYTCHK=11b

The transfer length depends on field BYTCHK, which is encoded in byte
1, bits 1..2.  However, the guard for for case BYTCHK=11b doesn't
work, and we get case 01b instead.  Fix it.

Note that since emulated scsi-hd fails the command outright, it takes
SCSI passthrough of a device that actually implements VERIFY with
BYTCHK=11b to make the bug bite.

Screwed up in commit d12ad44.  Spotted by Coverity.

Cc: address@hidden
Signed-off-by: Markus Armbruster <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 837c390137193e715fee20b35c0ddb164b1c4fa4
      
https://github.com/qemu/qemu/commit/837c390137193e715fee20b35c0ddb164b1c4fa4
  Author: Peter Lieven <address@hidden>
  Date:   2014-02-22 (Sat, 22 Feb 2014)

  Changed paths:
    M block/iscsi.c

  Log Message:
  -----------
  block/iscsi: fix deadlock on scsi check condition

the retry logic was broken because the complete status
of the task structure was not reset. this resulted in
an infinite loop retrying the command over and over.

CC: address@hidden
Signed-off-by: Peter Lieven <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 24d3bd67aca958c8ea103646d9d326de00056e4d
      
https://github.com/qemu/qemu/commit/24d3bd67aca958c8ea103646d9d326de00056e4d
  Author: Peter Lieven <address@hidden>
  Date:   2014-02-22 (Sat, 22 Feb 2014)

  Changed paths:
    M block/iscsi.c

  Log Message:
  -----------
  block/iscsi: query for supported VPD pages

this patch ensures that we only query for block provisioning and
block limits vpd pages if they are advertised. It also cleans
up the inquiry code and eliminates some redundant code.

Signed-off-by: Peter Lieven <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 64cc22841e72d37d577416f5836155ecd0a9bfb6
      
https://github.com/qemu/qemu/commit/64cc22841e72d37d577416f5836155ecd0a9bfb6
  Author: Roland Dreier <address@hidden>
  Date:   2014-02-22 (Sat, 22 Feb 2014)

  Changed paths:
    M hw/scsi/scsi-disk.c

  Log Message:
  -----------
  scsi-disk: Add support for port WWN and index descriptors in VPD page 83h

To make a VM more convincing to my application, it's useful to be able
to add a port WWN and relative target port index to the descriptors
returned for VPD page 83h.  Add device properties to allow setting
these, and return them from INQUIRY commands.

Signed-off-by: Roland Dreier <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: d9738fd2463f71530d8d92fbb52ebdd1d78074fc
      
https://github.com/qemu/qemu/commit/d9738fd2463f71530d8d92fbb52ebdd1d78074fc
  Author: Peter Lieven <address@hidden>
  Date:   2014-02-22 (Sat, 22 Feb 2014)

  Changed paths:
    M block/iscsi.c

  Log Message:
  -----------
  block/iscsi: fix segfault if writesame fails

commit fa6252b0 introduced a segfault because it tries
to read iTask.task->sense after iTask.task has been
freed.

Signed-off-by: Peter Lieven <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 739aa555b8d6e45920b44cb7a2a790fce5061890
      
https://github.com/qemu/qemu/commit/739aa555b8d6e45920b44cb7a2a790fce5061890
  Author: Peter Maydell <address@hidden>
  Date:   2014-03-04 (Tue, 04 Mar 2014)

  Changed paths:
    M block/iscsi.c
    M hw/scsi/scsi-bus.c
    M hw/scsi/scsi-disk.c
    M hw/scsi/scsi-generic.c
    M hw/scsi/spapr_vscsi.c
    M include/hw/scsi/scsi.h

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/bonzini/scsi-next' into staging

* remotes/bonzini/scsi-next:
  block/iscsi: fix segfault if writesame fails
  scsi-disk: Add support for port WWN and index descriptors in VPD page 83h
  block/iscsi: query for supported VPD pages
  block/iscsi: fix deadlock on scsi check condition
  scsi-bus: Fix transfer length for VERIFY with BYTCHK=11b
  scsi: report thin provisioning errors with werror=report
  scsi: Change scsi sense buf size to 252

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/d47e95c0c86e...739aa555b8d6