tools/virtio: fix build breakage
Previous commit ("virtio: add context flag to find vqs") added a new 'context' flag to vring_new_virtqueue(), but the corresponding API in tools/virtio/ is not updated causing build errors due to conflicting declarations. Bring code in tools/virtio in sync with that in kernel. I have used 'false' for the value of the new boolean 'context' flag as that seems to be the best way to preserve existing behavior. Tested with: $ make -C tools/virtio clean all ARCH=x86 Signed-off-by: Sekhar Nori <nsekhar@ti.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>zero-colors
parent
f94682dde5
commit
0a12ae4024
|
@ -57,6 +57,7 @@ struct virtqueue *vring_new_virtqueue(unsigned int index,
|
||||||
unsigned int vring_align,
|
unsigned int vring_align,
|
||||||
struct virtio_device *vdev,
|
struct virtio_device *vdev,
|
||||||
bool weak_barriers,
|
bool weak_barriers,
|
||||||
|
bool ctx,
|
||||||
void *pages,
|
void *pages,
|
||||||
bool (*notify)(struct virtqueue *vq),
|
bool (*notify)(struct virtqueue *vq),
|
||||||
void (*callback)(struct virtqueue *vq),
|
void (*callback)(struct virtqueue *vq),
|
||||||
|
|
|
@ -100,7 +100,7 @@ static void vq_info_add(struct vdev_info *dev, int num)
|
||||||
vring_init(&info->vring, num, info->ring, 4096);
|
vring_init(&info->vring, num, info->ring, 4096);
|
||||||
info->vq = vring_new_virtqueue(info->idx,
|
info->vq = vring_new_virtqueue(info->idx,
|
||||||
info->vring.num, 4096, &dev->vdev,
|
info->vring.num, 4096, &dev->vdev,
|
||||||
true, info->ring,
|
true, false, info->ring,
|
||||||
vq_notify, vq_callback, "test");
|
vq_notify, vq_callback, "test");
|
||||||
assert(info->vq);
|
assert(info->vq);
|
||||||
info->vq->priv = info;
|
info->vq->priv = info;
|
||||||
|
|
|
@ -314,7 +314,8 @@ static int parallel_test(u64 features,
|
||||||
err(1, "Could not set affinity to cpu %u", first_cpu);
|
err(1, "Could not set affinity to cpu %u", first_cpu);
|
||||||
|
|
||||||
vq = vring_new_virtqueue(0, RINGSIZE, ALIGN, &gvdev.vdev, true,
|
vq = vring_new_virtqueue(0, RINGSIZE, ALIGN, &gvdev.vdev, true,
|
||||||
guest_map, fast_vringh ? no_notify_host
|
false, guest_map,
|
||||||
|
fast_vringh ? no_notify_host
|
||||||
: parallel_notify_host,
|
: parallel_notify_host,
|
||||||
never_callback_guest, "guest vq");
|
never_callback_guest, "guest vq");
|
||||||
|
|
||||||
|
@ -479,7 +480,7 @@ int main(int argc, char *argv[])
|
||||||
memset(__user_addr_min, 0, vring_size(RINGSIZE, ALIGN));
|
memset(__user_addr_min, 0, vring_size(RINGSIZE, ALIGN));
|
||||||
|
|
||||||
/* Set up guest side. */
|
/* Set up guest side. */
|
||||||
vq = vring_new_virtqueue(0, RINGSIZE, ALIGN, &vdev, true,
|
vq = vring_new_virtqueue(0, RINGSIZE, ALIGN, &vdev, true, false,
|
||||||
__user_addr_min,
|
__user_addr_min,
|
||||||
never_notify_host, never_callback_guest,
|
never_notify_host, never_callback_guest,
|
||||||
"guest vq");
|
"guest vq");
|
||||||
|
@ -663,7 +664,7 @@ int main(int argc, char *argv[])
|
||||||
/* Force creation of direct, which we modify. */
|
/* Force creation of direct, which we modify. */
|
||||||
__virtio_clear_bit(&vdev, VIRTIO_RING_F_INDIRECT_DESC);
|
__virtio_clear_bit(&vdev, VIRTIO_RING_F_INDIRECT_DESC);
|
||||||
vq = vring_new_virtqueue(0, RINGSIZE, ALIGN, &vdev, true,
|
vq = vring_new_virtqueue(0, RINGSIZE, ALIGN, &vdev, true,
|
||||||
__user_addr_min,
|
false, __user_addr_min,
|
||||||
never_notify_host,
|
never_notify_host,
|
||||||
never_callback_guest,
|
never_callback_guest,
|
||||||
"guest vq");
|
"guest vq");
|
||||||
|
|
Loading…
Reference in New Issue