mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-09-06 09:55:55 +00:00
virtio-scsi: don't uninitialize queues that we didn't initialize
Count number of queues that we initialized and only deinitialize these that we initialized successfully. Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com> Message-Id: <20201217150040.906961-3-mlevitsk@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
e0f7fc588d
commit
dec2bb14b8
|
@ -126,6 +126,7 @@ int virtio_scsi_dataplane_start(VirtIODevice *vdev)
|
|||
{
|
||||
int i;
|
||||
int rc;
|
||||
int vq_init_count = 0;
|
||||
BusState *qbus = qdev_get_parent_bus(DEVICE(vdev));
|
||||
VirtioBusClass *k = VIRTIO_BUS_GET_CLASS(qbus);
|
||||
VirtIOSCSICommon *vs = VIRTIO_SCSI_COMMON(vdev);
|
||||
|
@ -153,17 +154,22 @@ int virtio_scsi_dataplane_start(VirtIODevice *vdev)
|
|||
if (rc) {
|
||||
goto fail_vrings;
|
||||
}
|
||||
|
||||
vq_init_count++;
|
||||
rc = virtio_scsi_vring_init(s, vs->event_vq, 1,
|
||||
virtio_scsi_data_plane_handle_event);
|
||||
if (rc) {
|
||||
goto fail_vrings;
|
||||
}
|
||||
|
||||
vq_init_count++;
|
||||
for (i = 0; i < vs->conf.num_queues; i++) {
|
||||
rc = virtio_scsi_vring_init(s, vs->cmd_vqs[i], i + 2,
|
||||
virtio_scsi_data_plane_handle_cmd);
|
||||
if (rc) {
|
||||
goto fail_vrings;
|
||||
}
|
||||
vq_init_count++;
|
||||
}
|
||||
|
||||
s->dataplane_starting = false;
|
||||
|
@ -174,7 +180,7 @@ int virtio_scsi_dataplane_start(VirtIODevice *vdev)
|
|||
fail_vrings:
|
||||
aio_wait_bh_oneshot(s->ctx, virtio_scsi_dataplane_stop_bh, s);
|
||||
aio_context_release(s->ctx);
|
||||
for (i = 0; i < vs->conf.num_queues + 2; i++) {
|
||||
for (i = 0; i < vq_init_count; i++) {
|
||||
virtio_bus_set_host_notifier(VIRTIO_BUS(qbus), i, false);
|
||||
virtio_bus_cleanup_host_notifier(VIRTIO_BUS(qbus), i);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue