virtio-scsi: fix dataplane
authorPaolo Bonzini <pbonzini@redhat.com>
Fri, 31 Oct 2014 16:38:04 +0000 (17:38 +0100)
committerPaolo Bonzini <pbonzini@redhat.com>
Fri, 31 Oct 2014 16:39:41 +0000 (17:39 +0100)
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>
hw/scsi/virtio-scsi-dataplane.c

index 3097d54..9651e6f 100644 (file)
@@ -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);