diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2014-12-04 19:31:45 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2014-12-09 21:42:00 +0200 |
| commit | d71a6fc6b97fba1de999c6f0fab5c75544afab76 (patch) | |
| tree | 4f29a0280f7725f6807af7f28ec9f078b80c7bde | |
| parent | 63d9f218a3cdaa2316ede9099d6be2c619ec5b9f (diff) | |
| download | linux-d71a6fc6b97fba1de999c6f0fab5c75544afab76.tar.bz2 | |
virtio: drop legacy_only driver flag
legacy_only flag is now unused, drop it from core.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>
| -rw-r--r-- | drivers/virtio/virtio.c | 4 | ||||
| -rw-r--r-- | include/linux/virtio.h | 2 |
2 files changed, 0 insertions, 6 deletions
diff --git a/drivers/virtio/virtio.c b/drivers/virtio/virtio.c index e1673a511d17..f22665868781 100644 --- a/drivers/virtio/virtio.c +++ b/drivers/virtio/virtio.c @@ -198,10 +198,6 @@ static int virtio_dev_probe(struct device *_d) driver_features_legacy = driver_features; } - /* Detect legacy-only drivers and disable VIRTIO_F_VERSION_1. */ - if (drv->legacy_only) - device_features &= ~(1ULL << VIRTIO_F_VERSION_1); - if (device_features & (1ULL << VIRTIO_F_VERSION_1)) dev->features = driver_features & device_features; else diff --git a/include/linux/virtio.h b/include/linux/virtio.h index d666bcb57401..d09e0938fd60 100644 --- a/include/linux/virtio.h +++ b/include/linux/virtio.h @@ -134,7 +134,6 @@ int virtio_device_restore(struct virtio_device *dev); * @feature_table_size: number of entries in the feature table array. * @feature_table_legacy: same as feature_table but when working in legacy mode. * @feature_table_size_legacy: number of entries in feature table legacy array. - * @legacy_only: driver does not support virtio 1.0. * @probe: the function to call when a device is found. Returns 0 or -errno. * @remove: the function to call when a device is removed. * @config_changed: optional function to call when the device configuration @@ -147,7 +146,6 @@ struct virtio_driver { unsigned int feature_table_size; const unsigned int *feature_table_legacy; unsigned int feature_table_size_legacy; - bool legacy_only; int (*probe)(struct virtio_device *dev); void (*scan)(struct virtio_device *dev); void (*remove)(struct virtio_device *dev); |