From: Christian Borntraeger <[email protected]> This patch allows a virtio driver to use VIRTIO_DEV_ANY_ID for the device id. This will be used by a test module that can be bound to any virtio device.
Signed-off-by: Christian Borntraeger <[email protected]> --- drivers/virtio/virtio.c | 2 +- scripts/mod/file2alias.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Index: linux-next/drivers/virtio/virtio.c =================================================================== --- linux-next.orig/drivers/virtio/virtio.c +++ linux-next/drivers/virtio/virtio.c @@ -58,7 +58,7 @@ static struct device_attribute virtio_de 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; Index: linux-next/scripts/mod/file2alias.c =================================================================== --- linux-next.orig/scripts/mod/file2alias.c +++ linux-next/scripts/mod/file2alias.c @@ -641,7 +641,7 @@ static int do_virtio_entry(const char *f id->vendor = TO_NATIVE(id->vendor); strcpy(alias, "virtio:"); - ADD(alias, "d", 1, id->device); + ADD(alias, "d", id->device != VIRTIO_DEV_ANY_ID, id->device); ADD(alias, "v", id->vendor != VIRTIO_DEV_ANY_ID, id->vendor); add_wildcard(alias); _______________________________________________ Virtualization mailing list [email protected] https://lists.linux-foundation.org/mailman/listinfo/virtualization
