diff options
| author | Anthony Liguori | 2014-01-25 00:50:14 +0100 |
|---|---|---|
| committer | Anthony Liguori | 2014-01-25 00:50:14 +0100 |
| commit | e9f526ab7b01662c323a47446e22308968221ac1 (patch) | |
| tree | 58f91d4bfe27f82108db0e15bd41661f7a2282b1 /hw/ide/core.c | |
| parent | Merge remote-tracking branch 'kwolf/tags/for-anthony' into staging (diff) | |
| parent | scsi: Support TEST UNIT READY in the dummy LUN0 (diff) | |
| download | qemu-e9f526ab7b01662c323a47446e22308968221ac1.tar.gz qemu-e9f526ab7b01662c323a47446e22308968221ac1.tar.xz qemu-e9f526ab7b01662c323a47446e22308968221ac1.zip | |
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>
Diffstat (limited to 'hw/ide/core.c')
0 files changed, 0 insertions, 0 deletions