diff options
author | Christian Borntraeger <borntraeger@de.ibm.com> | 2009-05-26 09:46:10 -0400 |
---|---|---|
committer | Rusty Russell <rusty@rustcorp.com.au> | 2009-06-12 08:46:40 -0400 |
commit | e3353853730eb99c56b7b0aed1667d51c0e3699a (patch) | |
tree | d0da26c34a8ca12a57662830fd698ca6696f3805 | |
parent | c89e80168ba1ed37627fe03116b0cf8474dcb7e0 (diff) |
virtio: enhance id_matching for virtio drivers
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 <borntraeger@de.ibm.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
-rw-r--r-- | drivers/virtio/virtio.c | 2 | ||||
-rw-r--r-- | scripts/mod/file2alias.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/virtio/virtio.c b/drivers/virtio/virtio.c index 22642a255d3..3a43ebf83a4 100644 --- a/drivers/virtio/virtio.c +++ b/drivers/virtio/virtio.c | |||
@@ -58,7 +58,7 @@ static struct device_attribute virtio_dev_attrs[] = { | |||
58 | static inline int virtio_id_match(const struct virtio_device *dev, | 58 | static inline int virtio_id_match(const struct virtio_device *dev, |
59 | const struct virtio_device_id *id) | 59 | const struct virtio_device_id *id) |
60 | { | 60 | { |
61 | if (id->device != dev->id.device) | 61 | if (id->device != dev->id.device && id->device != VIRTIO_DEV_ANY_ID) |
62 | return 0; | 62 | return 0; |
63 | 63 | ||
64 | return id->vendor == VIRTIO_DEV_ANY_ID || id->vendor == dev->id.vendor; | 64 | return id->vendor == VIRTIO_DEV_ANY_ID || id->vendor == dev->id.vendor; |
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c index a3344285ccf..40e0045876e 100644 --- a/scripts/mod/file2alias.c +++ b/scripts/mod/file2alias.c | |||
@@ -641,7 +641,7 @@ static int do_virtio_entry(const char *filename, struct virtio_device_id *id, | |||
641 | id->vendor = TO_NATIVE(id->vendor); | 641 | id->vendor = TO_NATIVE(id->vendor); |
642 | 642 | ||
643 | strcpy(alias, "virtio:"); | 643 | strcpy(alias, "virtio:"); |
644 | ADD(alias, "d", 1, id->device); | 644 | ADD(alias, "d", id->device != VIRTIO_DEV_ANY_ID, id->device); |
645 | ADD(alias, "v", id->vendor != VIRTIO_DEV_ANY_ID, id->vendor); | 645 | ADD(alias, "v", id->vendor != VIRTIO_DEV_ANY_ID, id->vendor); |
646 | 646 | ||
647 | add_wildcard(alias); | 647 | add_wildcard(alias); |