From: Cornelia Huck <cornelia.huck@xxxxxxxxxx>
Now that virtio-ccw has everything needed to support virtio 1.0 in
place, try to enable it if the host supports it.
MST: enable virtio 1.0 feature bit
Reviewed-by: David Hildenbrand <dahi@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Cornelia Huck <cornelia.huck@xxxxxxxxxx>
Signed-off-by: Michael S. Tsirkin <mst@xxxxxxxxxx>
---
drivers/s390/kvm/virtio_ccw.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/s390/kvm/virtio_ccw.c b/drivers/s390/kvm/virtio_ccw.c
index 50306b2..8ec68dd 100644
--- a/drivers/s390/kvm/virtio_ccw.c
+++ b/drivers/s390/kvm/virtio_ccw.c
@@ -103,7 +103,7 @@ struct virtio_rev_info {
};
/* the highest virtio-ccw revision we support */
-#define VIRTIO_CCW_REV_MAX 0
+#define VIRTIO_CCW_REV_MAX 1
struct virtio_ccw_vq_info {
struct virtqueue *vq;
@@ -746,8 +746,7 @@ static u64 virtio_ccw_get_features(struct virtio_device *vdev)
out_free:
kfree(features);
kfree(ccw);
- /* TODO: enable virtio 1.0 */
- return rc & ~BIT_ULL(VIRTIO_F_VERSION_1);;
+ return rc;
}
static void virtio_ccw_finalize_features(struct virtio_device *vdev)
--
MST
--
To unsubscribe from this list: send the line "unsubscribe linux-s390" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
