projects / qemu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0d688cf 1cb27d9)
Merge remote-tracking branch 'bonzini/scsi-next' into staging
authorAnthony Liguori <aliguori@amazon.com>
Fri, 24 Jan 2014 23:50:14 +0000 (15:50 -0800)
committerAnthony Liguori <aliguori@amazon.com>
Fri, 24 Jan 2014 23:50:14 +0000 (15:50 -0800)
commite9f526ab7b01662c323a47446e22308968221ac1
tree58f91d4bfe27f82108db0e15bd41661f7a2282b1tree | snapshot
parent0d688cf7d8d71bce2aab83173552a784e96b6729commit | diff
parent1cb27d9233d572826b45bd8498d2fab1b6f01df9commit | diff
Merge remote-tracking branch 'bonzini/scsi-next' into staging

* bonzini/scsi-next:
  scsi: Support TEST UNIT READY in the dummy LUN0
  block: add .bdrv_reopen_prepare() stub for iscsi
  virtio-scsi: Prevent assertion on missed events
  virtio-scsi: Cleanup of I/Os that never started
  scsi: Assign cancel_io vector for scsi_disk_emulate_ops

Conflicts:
block/iscsi.c

aliguori: resolve trivial merge conflict in block/iscsi.c

Signed-off-by: Anthony Liguori <aliguori@amazon.com>
block/iscsi.c diff1 | diff2 | blob | history
hw/scsi/scsi-disk.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.