Commit 8fe9805c authored Jul 23, 2020 by Philippe Mathieu-Daudé Committed by Michael S. Tsirkin Jul 27, 2020

libvhost-user: Report descriptor index on panic



We want to report the index of the descriptor,
not its pointer.

Fixes: 7b2e5c65 ("contrib: add libvhost-user")
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200723171935.18535-1-philmd@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Raphael Norwitz <raphael.norwitz@nutanix.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Cc: qemu-stable@nongnu.org
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

parent 4fdecf05

contrib/libvhost-user/libvhost-user.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -2074,7 +2074,7 @@ virtqueue_get_head(VuDev dev, VuVirtq vq,

		/* If their number is silly, that's a fatal mistake. */
		if (*head >= vq->vring.num) {
		vu_panic(dev, "Guest says index %u is available", head);
		vu_panic(dev, "Guest says index %u is available", *head);
		return false;
		}

		@@ -2133,7 +2133,7 @@ virtqueue_read_next_desc(VuDev dev, struct vring_desc desc,
		smp_wmb();

		if (*next >= max) {
		vu_panic(dev, "Desc next is %u", next);
		vu_panic(dev, "Desc next is %u", *next);
		return VIRTQUEUE_READ_DESC_ERROR;
		}