diff options
| author |   Michael S. Tsirkin <mst@redhat.com> | 2014-12-09 14:46:44 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2014-12-09 21:42:06 +0200 |
| commit | f13d8bc2a16c5d1dd3dbd8b64dbd42cfe78da93e (patch) | |
| tree | 3450e7003ccb71e30c3f14c6aa45332c6911d078 /drivers/s390 | |
| parent | virtio_pci: rename virtio_pci -> virtio_pci_common (diff) | |
| download | linux-dev-f13d8bc2a16c5d1dd3dbd8b64dbd42cfe78da93e.tar.xz linux-dev-f13d8bc2a16c5d1dd3dbd8b64dbd42cfe78da93e.zip | |
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>
Diffstat (limited to 'drivers/s390')
| -rw-r--r-- | drivers/s390/kvm/virtio_ccw.c | 2 |
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) struct virtio_feature_desc *features; struct ccw1 *ccw; - if (vcdev->revision == 1 && + if (vcdev->revision >= 1 && !__virtio_test_bit(vdev, VIRTIO_F_VERSION_1)) { dev_err(&vdev->dev, "virtio: device uses revision 1 " "but does not have VIRTIO_F_VERSION_1\n"); |