]> git.ipfire.org Git - thirdparty/qemu.git/commit
vhost: drop legacy vring layout bits
authorGreg Kurz <groug@kaod.org>
Fri, 4 Nov 2016 08:39:22 +0000 (09:39 +0100)
committerMichael Roth <mdroth@linux.vnet.ibm.com>
Mon, 12 Dec 2016 23:49:41 +0000 (17:49 -0600)
commitc8a3159df41f1da9f8b25b9d6387cd1b78b0f4b2
tree46302ac0458cb15be21bb41d1a9d28ccdaa09a07
parent48fdfebab6469d748b7e85ae96b15e052e5efe0d
vhost: drop legacy vring layout bits

The legacy vring layout is not used anymore as we use the separate
mappings even for legacy devices.
This patch simply removes it.

This also fixes a bug with virtio 1 devices when the vring descriptor table
is mapped at a higher address than the used vring because the following
function may return an insanely great value:

hwaddr virtio_queue_get_ring_size(VirtIODevice *vdev, int n)
{
    return vdev->vq[n].vring.used - vdev->vq[n].vring.desc +
           virtio_queue_get_used_size(vdev, n);
}

and the mapping fails.

Signed-off-by: Greg Kurz <groug@kaod.org>
Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
(cherry picked from commit 1cdce7c54d26e64f5eddb10a6f4f7dd938dfc2c4)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
hw/virtio/vhost.c
include/hw/virtio/vhost.h