« Previous | Next » 

Revision e9f526ab

IDe9f526ab7b01662c323a47446e22308968221ac1

Added by Anthony Liguori over 10 years ago

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 <>

Files

  • added
  • modified
  • copied
  • renamed
  • deleted