[PATCH 02/18] virtio_test: update for 64 bit features
From: "Michael S. Tsirkin" <mst@redhat.com>
Date: 2011-05-04 20:51:37
Also in:
kvm, linux-s390, lkml, virtualization
Subsystem:
the rest, virtio core · Maintainers:
Linus Torvalds, "Michael S. Tsirkin", Jason Wang
Extend the virtio_test tool so it can work with 64 bit features. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> --- tools/virtio/virtio_test.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/tools/virtio/virtio_test.c b/tools/virtio/virtio_test.c
index df0c6d2..9e65e6d 100644
--- a/tools/virtio/virtio_test.c
+++ b/tools/virtio/virtio_test.c@@ -55,7 +55,6 @@ void vhost_vq_setup(struct vdev_info *dev, struct vq_info *info) { struct vhost_vring_state state = { .index = info->idx }; struct vhost_vring_file file = { .index = info->idx }; - unsigned long long features = dev->vdev.features[0]; struct vhost_vring_addr addr = { .index = info->idx, .desc_user_addr = (uint64_t)(unsigned long)info->vring.desc,
@@ -63,6 +62,10 @@ void vhost_vq_setup(struct vdev_info *dev, struct vq_info *info) .used_user_addr = (uint64_t)(unsigned long)info->vring.used, }; int r; + unsigned long long features = dev->vdev.features[0]; + if (sizeof features > sizeof dev->vdev.features[0]) + features |= ((unsigned long long)dev->vdev.features[1]) << 32; + r = ioctl(dev->control, VHOST_SET_FEATURES, &features); assert(r >= 0); state.num = info->vring.num;
@@ -107,7 +110,8 @@ static void vdev_info_init(struct vdev_info* dev, unsigned long long features) int r; memset(dev, 0, sizeof *dev); dev->vdev.features[0] = features; - dev->vdev.features[1] = features >> 32; + if (sizeof features > sizeof dev->vdev.features[0]) + dev->vdev.features[1] = features >> 32; dev->buf_size = 1024; dev->buf = malloc(dev->buf_size); assert(dev->buf);
--
1.7.5.53.gc233e