summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2014-01-15 10:35:36 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2014-01-15 10:36:06 +0100
commit33325a53f15ab5370e1917b2a11cadffc77c5a52 (patch)
tree503b2aa03f2b2375614da3d6f02b5a9ccd8868af
parent1cf892ca2689c84960b4ce4d2723b6bee453711c (diff)
downloadfocaccia-qemu-33325a53f15ab5370e1917b2a11cadffc77c5a52.tar.gz
focaccia-qemu-33325a53f15ab5370e1917b2a11cadffc77c5a52.zip
scsi: Assign cancel_io vector for scsi_disk_emulate_ops
Some emulated disk operations (MODE SELECT, UNMAP, WRITE SAME)
can trigger asynchronous I/Os.  Provide the cancel_io callback
to ensure that AIOCBs are properly cleaned up.

Signed-off-by: Eric Farman <farman@linux.vnet.ibm.com>
Cc: qemu-stable@nongnu.org
[Tweak commit message. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--hw/scsi/scsi-disk.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c
index bce617cb93..ee1f5ebcf4 100644
--- a/hw/scsi/scsi-disk.c
+++ b/hw/scsi/scsi-disk.c
@@ -2306,6 +2306,7 @@ static const SCSIReqOps scsi_disk_emulate_reqops = {
     .send_command = scsi_disk_emulate_command,
     .read_data    = scsi_disk_emulate_read_data,
     .write_data   = scsi_disk_emulate_write_data,
+    .cancel_io    = scsi_cancel_io,
     .get_buf      = scsi_get_buf,
 };