diff options
| author | Anthony Liguori <aliguori@amazon.com> | 2014-01-24 15:50:14 -0800 |
|---|---|---|
| committer | Anthony Liguori <aliguori@amazon.com> | 2014-01-24 15:50:14 -0800 |
| commit | e9f526ab7b01662c323a47446e22308968221ac1 (patch) | |
| tree | 58f91d4bfe27f82108db0e15bd41661f7a2282b1 /hw/core/qdev-properties-system.c | |
| parent | 0d688cf7d8d71bce2aab83173552a784e96b6729 (diff) | |
| parent | 1cb27d9233d572826b45bd8498d2fab1b6f01df9 (diff) | |
| download | focaccia-qemu-e9f526ab7b01662c323a47446e22308968221ac1.tar.gz focaccia-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/core/qdev-properties-system.c')
0 files changed, 0 insertions, 0 deletions