aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael S. Tsirkin <mst@redhat.com>2014-12-09 07:46:44 -0500
committerMichael S. Tsirkin <mst@redhat.com>2014-12-09 14:42:06 -0500
commitf13d8bc2a16c5d1dd3dbd8b64dbd42cfe78da93e (patch)
tree3450e7003ccb71e30c3f14c6aa45332c6911d078
parent5f4c976089ca176c7780c0431308b4e71041702a (diff)
virtio_ccw: future-proof finalize_features
We never negotiate revision > 1, but just to make this code more likely to work when we do, require VERSION_1 with any revision >= 1. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>
-rw-r--r--drivers/s390/kvm/virtio_ccw.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/kvm/virtio_ccw.c b/drivers/s390/kvm/virtio_ccw.c
index f9f87ba013c9..f92b9e66c200 100644
--- a/drivers/s390/kvm/virtio_ccw.c
+++ b/drivers/s390/kvm/virtio_ccw.c
@@ -758,7 +758,7 @@ static int virtio_ccw_finalize_features(struct virtio_device *vdev)
758 struct virtio_feature_desc *features; 758 struct virtio_feature_desc *features;
759 struct ccw1 *ccw; 759 struct ccw1 *ccw;
760 760
761 if (vcdev->revision == 1 && 761 if (vcdev->revision >= 1 &&
762 !__virtio_test_bit(vdev, VIRTIO_F_VERSION_1)) { 762 !__virtio_test_bit(vdev, VIRTIO_F_VERSION_1)) {
763 dev_err(&vdev->dev, "virtio: device uses revision 1 " 763 dev_err(&vdev->dev, "virtio: device uses revision 1 "
764 "but does not have VIRTIO_F_VERSION_1\n"); 764 "but does not have VIRTIO_F_VERSION_1\n");