From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39761) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSyIm-0006lr-W1 for qemu-devel@nongnu.org; Thu, 28 Jul 2016 23:17:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bSyIj-0003CE-3G for qemu-devel@nongnu.org; Thu, 28 Jul 2016 23:17:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34412) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSyIi-0003CA-Ti for qemu-devel@nongnu.org; Thu, 28 Jul 2016 23:17:29 -0400 Date: Fri, 29 Jul 2016 06:17:25 +0300 From: "Michael S. Tsirkin" Message-ID: <1469762011-7902-41-git-send-email-mst@redhat.com> References: <1469762011-7902-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <1469762011-7902-1-git-send-email-mst@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 40/41] vhost: do not update last avail idx on get_vring_base() failure List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , =?iso-8859-1?Q?Marc-Andr=E9?= Lureau From: Marc-Andr=E9 Lureau The state.num value will probably be 0 in this case, but that doesn't make sense to update. Signed-off-by: Marc-Andr=E9 Lureau Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/virtio/vhost.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index b0e8ecc..3d0c807 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -945,8 +945,9 @@ static void vhost_virtqueue_stop(struct vhost_dev *de= v, r =3D 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); =20 /* In the cross-endian case, we need to reset the vring endianness t= o --=20 MST