diff options
| author | Philippe Mathieu-Daudé <philmd@redhat.com> | 2020-07-23 19:19:35 +0200 |
|---|---|---|
| committer | Michael Roth <mdroth@linux.vnet.ibm.com> | 2020-09-09 18:51:39 -0500 |
| commit | eca194d43ca4524d0f3552d7b91b15c145649b33 (patch) | |
| tree | eca7763e957fbde5e69b60b0a9c61859bdbb6cbc | |
| parent | d8f0b2bbf4a1ab473c658a56ef5bf3ea57c3c384 (diff) | |
| download | qemu-eca194d43ca4524d0f3552d7b91b15c145649b33.zip qemu-eca194d43ca4524d0f3552d7b91b15c145649b33.tar.gz qemu-eca194d43ca4524d0f3552d7b91b15c145649b33.tar.bz2 | |
libvhost-user: Report descriptor index on panic
We want to report the index of the descriptor,
not its pointer.
Fixes: 7b2e5c65f4 ("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>
(cherry picked from commit 8fe9805c73c277dc2feeaa83de73d6a58bf23f39)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| -rw-r--r-- | contrib/libvhost-user/libvhost-user.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/libvhost-user/libvhost-user.c b/contrib/libvhost-user/libvhost-user.c index 3bca996..301f6d6 100644 --- a/contrib/libvhost-user/libvhost-user.c +++ b/contrib/libvhost-user/libvhost-user.c @@ -1867,7 +1867,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; } @@ -1926,7 +1926,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; } |