1 files changed, 24 insertions, 5 deletions

diff --git a/drivers/virtio/virtio.c b/drivers/virtio/virtio.c
index 018c070a357f..3a43ebf83a49 100644
--- a/drivers/virtio/virtio.c
+++ b/drivers/virtio/virtio.c
@@ -31,21 +31,37 @@ static ssize_t modalias_show(struct device *_d,
         return sprintf(buf, "virtio:d%08Xv%08X\n",
                        dev->id.device, dev->id.vendor);
 }
+static ssize_t features_show(struct device *_d,
+                             struct device_attribute *attr, char *buf)
+{
+        struct virtio_device *dev = container_of(_d, struct virtio_device, dev);
+        unsigned int i;
+        ssize_t len = 0;
+
+        /* We actually represent this as a bitstring, as it could be
+         * arbitrary length in future. */
+        for (i = 0; i < ARRAY_SIZE(dev->features)*BITS_PER_LONG; i++)
+                len += sprintf(buf+len, "%c",
+                               test_bit(i, dev->features) ? '1' : '0');
+        len += sprintf(buf+len, "\n");
+        return len;
+}
 static struct device_attribute virtio_dev_attrs[] = {
         __ATTR_RO(device),
         __ATTR_RO(vendor),
         __ATTR_RO(status),
         __ATTR_RO(modalias),
+        __ATTR_RO(features),
         __ATTR_NULL
 };
 
 static inline int virtio_id_match(const struct virtio_device *dev,
                                   const struct virtio_device_id *id)
 {
-        if (id->device != dev->id.device)
+        if (id->device != dev->id.device && id->device != VIRTIO_DEV_ANY_ID)
                 return 0;
 
-        return id->vendor == VIRTIO_DEV_ANY_ID || id->vendor != dev->id.vendor;
+        return id->vendor == VIRTIO_DEV_ANY_ID || id->vendor == dev->id.vendor;
 }
 
 /* This looks through all the IDs a driver claims to support.  If any of them
@@ -118,13 +134,14 @@ static int virtio_dev_probe(struct device *_d)
                 if (device_features & (1 << i))
                         set_bit(i, dev->features);
 
+        dev->config->finalize_features(dev);
+
         err = drv->probe(dev);
         if (err)
                 add_status(dev, VIRTIO_CONFIG_S_FAILED);
-        else {
-                dev->config->finalize_features(dev);
+        else
                 add_status(dev, VIRTIO_CONFIG_S_DRIVER_OK);
-        }
+
         return err;
 }
 
@@ -185,6 +202,8 @@ int register_virtio_device(struct virtio_device *dev)
         /* Acknowledge that we've seen the device. */
         add_status(dev, VIRTIO_CONFIG_S_ACKNOWLEDGE);
 
+        INIT_LIST_HEAD(&dev->vqs);
+
         /* device_register() causes the bus infrastructure to look for a
          * matching driver. */
         err = device_register(&dev->dev);