projects / qemu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ca8c0fa 5a7733b)
Merge remote-tracking branch 'remotes/bonzini/scsi-next' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Thu, 22 May 2014 14:27:46 +0000 (15:27 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 22 May 2014 14:27:46 +0000 (15:27 +0100)
commit65903a8b0807dbe2983910060f5754d27762faed
tree150f41181a390d3d14c48c68b6ded8b3389442a9tree | snapshot
parentca8c0fab9504f000216308cafc833eb957fe9284commit | diff
parent5a7733b0b728bb4900bdeed12fef22651ce0ab58commit | diff
Merge remote-tracking branch 'remotes/bonzini/scsi-next' into staging

* remotes/bonzini/scsi-next:
  megasas: remove buildtime strings
  block: iscsi build fix if LIBISCSI_FEATURE_IOVECTOR is not defined
  virtio-scsi: Plug memory leak on virtio_scsi_push_event() error path
  scsi: Document intentional fall through in scsi_req_length()

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
block/iscsi.c diff1 | diff2 | blob | history
hw/scsi/scsi-bus.c diff1 | diff2 | blob | history
hw/scsi/virtio-scsi.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.