]> xenbits.xensource.com Git - qemu-xen.git/commitdiff
vhost: do not update last avail idx on get_vring_base() failure
authorMarc-André Lureau <marcandre.lureau@redhat.com>
Tue, 26 Jul 2016 21:15:27 +0000 (01:15 +0400)
committerMichael S. Tsirkin <mst@redhat.com>
Fri, 29 Jul 2016 02:47:17 +0000 (05:47 +0300)
The state.num value will probably be 0 in this case, but that
doesn't make sense to update.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
hw/virtio/vhost.c

index b0e8ecce605c0e6eb4d2f9d8b7dd1e16d38dcd76..3d0c807d0e01bd6cf1572a1b7eb1fd75a5234518 100644 (file)
@@ -945,8 +945,9 @@ static void vhost_virtqueue_stop(struct vhost_dev *dev,
     r = dev->vhost_ops->vhost_get_vring_base(dev, &state);
     if (r < 0) {
         VHOST_OPS_DEBUG("vhost VQ %d ring restore failed: %d", idx, r);
+    } else {
+        virtio_queue_set_last_avail_idx(vdev, idx, state.num);
     }
-    virtio_queue_set_last_avail_idx(vdev, idx, state.num);
     virtio_queue_invalidate_signalled_used(vdev, idx);
 
     /* In the cross-endian case, we need to reset the vring endianness to