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.

Michael S. Tsirkin committed 11 years ago

Commit f13d8bc1 parent 5f4c9761 file · +1 −1Browse files

Unified · Split

@@ -758,7 +758,7 @@ static int virtio_ccw_finalize_features(struct virtio_device *vdev) · 757 unmodified lines
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");

Keyboard shortcuts