diff options
author | Michael S. Tsirkin <mst@redhat.com> | 2014-12-01 09:49:44 -0500 |
---|---|---|
committer | Michael S. Tsirkin <mst@redhat.com> | 2014-12-09 05:06:32 -0500 |
commit | 51cdc3815f15cf1d6e25915965b34d5ea148e434 (patch) | |
tree | 6903f38696ff37bb1d77747e63dbd9669220367c | |
parent | 747ae34a6ef681fbd993be214d8c0a30bd4a2fda (diff) |
virtio: drop VIRTIO_F_VERSION_1 from drivers
Core activates this bit automatically now,
drop it from drivers that set it explicitly.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
-rw-r--r-- | drivers/block/virtio_blk.c | 1 | ||||
-rw-r--r-- | drivers/char/virtio_console.c | 1 | ||||
-rw-r--r-- | drivers/net/virtio_net.c | 1 | ||||
-rw-r--r-- | drivers/scsi/virtio_scsi.c | 1 |
4 files changed, 0 insertions, 4 deletions
diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c index 1f8b111c5dab..1fb9e09fbbc5 100644 --- a/drivers/block/virtio_blk.c +++ b/drivers/block/virtio_blk.c | |||
@@ -836,7 +836,6 @@ static unsigned int features[] = { | |||
836 | VIRTIO_BLK_F_RO, VIRTIO_BLK_F_BLK_SIZE, | 836 | VIRTIO_BLK_F_RO, VIRTIO_BLK_F_BLK_SIZE, |
837 | VIRTIO_BLK_F_TOPOLOGY, | 837 | VIRTIO_BLK_F_TOPOLOGY, |
838 | VIRTIO_BLK_F_MQ, | 838 | VIRTIO_BLK_F_MQ, |
839 | VIRTIO_F_VERSION_1, | ||
840 | }; | 839 | }; |
841 | 840 | ||
842 | static struct virtio_driver virtio_blk = { | 841 | static struct virtio_driver virtio_blk = { |
diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c index 775c89821364..6cc832b45185 100644 --- a/drivers/char/virtio_console.c +++ b/drivers/char/virtio_console.c | |||
@@ -2130,7 +2130,6 @@ static struct virtio_device_id id_table[] = { | |||
2130 | static unsigned int features[] = { | 2130 | static unsigned int features[] = { |
2131 | VIRTIO_CONSOLE_F_SIZE, | 2131 | VIRTIO_CONSOLE_F_SIZE, |
2132 | VIRTIO_CONSOLE_F_MULTIPORT, | 2132 | VIRTIO_CONSOLE_F_MULTIPORT, |
2133 | VIRTIO_F_VERSION_1, | ||
2134 | }; | 2133 | }; |
2135 | 2134 | ||
2136 | static struct virtio_device_id rproc_serial_id_table[] = { | 2135 | static struct virtio_device_id rproc_serial_id_table[] = { |
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 9ab3c50cab76..b8bd7191572d 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c | |||
@@ -2004,7 +2004,6 @@ static unsigned int features[] = { | |||
2004 | VIRTIO_NET_F_GUEST_ANNOUNCE, VIRTIO_NET_F_MQ, | 2004 | VIRTIO_NET_F_GUEST_ANNOUNCE, VIRTIO_NET_F_MQ, |
2005 | VIRTIO_NET_F_CTRL_MAC_ADDR, | 2005 | VIRTIO_NET_F_CTRL_MAC_ADDR, |
2006 | VIRTIO_F_ANY_LAYOUT, | 2006 | VIRTIO_F_ANY_LAYOUT, |
2007 | VIRTIO_F_VERSION_1, | ||
2008 | }; | 2007 | }; |
2009 | 2008 | ||
2010 | static struct virtio_driver virtio_net_driver = { | 2009 | static struct virtio_driver virtio_net_driver = { |
diff --git a/drivers/scsi/virtio_scsi.c b/drivers/scsi/virtio_scsi.c index d9ec80698d63..23082782344c 100644 --- a/drivers/scsi/virtio_scsi.c +++ b/drivers/scsi/virtio_scsi.c | |||
@@ -1085,7 +1085,6 @@ static unsigned int features[] = { | |||
1085 | VIRTIO_SCSI_F_HOTPLUG, | 1085 | VIRTIO_SCSI_F_HOTPLUG, |
1086 | VIRTIO_SCSI_F_CHANGE, | 1086 | VIRTIO_SCSI_F_CHANGE, |
1087 | VIRTIO_SCSI_F_T10_PI, | 1087 | VIRTIO_SCSI_F_T10_PI, |
1088 | VIRTIO_F_VERSION_1, | ||
1089 | }; | 1088 | }; |
1090 | 1089 | ||
1091 | static struct virtio_driver virtio_scsi_driver = { | 1090 | static struct virtio_driver virtio_scsi_driver = { |