aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2014-10-31 17:38:04 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2014-10-31 17:39:41 +0100
commitace386b4e0e088ed1d42fba697fbb68219aceee6 (patch)
treeacd4af9fc026a878352a9e2d98aa2224b0221bd4
parentdbc464d401f989bbca7812b068c3aded1d834f79 (diff)
downloadqemu-ace386b4e0e088ed1d42fba697fbb68219aceee6.zip
qemu-ace386b4e0e088ed1d42fba697fbb68219aceee6.tar.gz
qemu-ace386b4e0e088ed1d42fba697fbb68219aceee6.tar.bz2
virtio-scsi: fix dataplane
Commit 361dcc7 (virtio-scsi: dataplane: fail setup gracefully, 2014-10-15) actually broke successful dataplane setup in a not-so-graceful manner: qemu-system-x86_64: .../util/rfifolock.c:71: rfifolock_unlock: Assertion `r->nesting > 0' failed. due to a missing return statement. Fixes: 361dcc790db8c87b2e46ab610739191ced894c44 Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--hw/scsi/virtio-scsi-dataplane.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/scsi/virtio-scsi-dataplane.c b/hw/scsi/virtio-scsi-dataplane.c
index 3097d54..9651e6f 100644
--- a/hw/scsi/virtio-scsi-dataplane.c
+++ b/hw/scsi/virtio-scsi-dataplane.c
@@ -241,9 +241,10 @@ void virtio_scsi_dataplane_start(VirtIOSCSI *s)
}
}
- aio_context_release(s->ctx);
s->dataplane_starting = false;
s->dataplane_started = true;
+ aio_context_release(s->ctx);
+ return;
fail_vrings:
virtio_scsi_clear_aio(s);