From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44467) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bQ9pW-0001KG-KH for qemu-devel@nongnu.org; Thu, 21 Jul 2016 04:59:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bQ9pV-0007ki-Q5 for qemu-devel@nongnu.org; Thu, 21 Jul 2016 04:59:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38455) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bQ9pV-0007kd-KG for qemu-devel@nongnu.org; Thu, 21 Jul 2016 04:59:41 -0400 From: marcandre.lureau@redhat.com Date: Thu, 21 Jul 2016 12:57:50 +0400 Message-Id: <20160721085750.30008-32-marcandre.lureau@redhat.com> In-Reply-To: <20160721085750.30008-1-marcandre.lureau@redhat.com> References: <20160721085750.30008-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v5 31/31] RFC: 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: mukawa@igel.co.jp, yuanhan.liu@linux.intel.com, victork@redhat.com, jonshin@cisco.com, mst@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= From: Marc-Andr=C3=A9 Lureau The state.num value will probably be 0 in this case, but I guess that doesn't make sense to update. Signed-off-by: Marc-Andr=C3=A9 Lureau --- 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 c9466f1..6175d8b 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 2.9.0