diff options
author | Rusty Russell <rusty@rustcorp.com.au> | 2008-02-04 23:49:56 -0500 |
---|---|---|
committer | Rusty Russell <rusty@rustcorp.com.au> | 2008-02-04 07:49:57 -0500 |
commit | a586d4f6016f7139d8c26df0e6927131168d3b5b (patch) | |
tree | 1c47e1a6b6b8fb18baa42f32980f29c4ae9cbbdc /drivers/char/virtio_console.c | |
parent | f35d9d8aae08940b7fdd1bb8110619da2ece6b28 (diff) |
virtio: simplify config mechanism.
Previously we used a type/len pair within the config space, but this
seems overkill. We now simply define a structure which represents the
layout in the config space: the config space can now only be extended
at the end.
The main driver-visible changes:
1) We indicate what fields are present with an explicit feature bit.
2) Virtqueues are explicitly numbered, and not in the config space.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'drivers/char/virtio_console.c')
-rw-r--r-- | drivers/char/virtio_console.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c index e34da5c9719..dc17fe3a88b 100644 --- a/drivers/char/virtio_console.c +++ b/drivers/char/virtio_console.c | |||
@@ -158,13 +158,13 @@ static int __devinit virtcons_probe(struct virtio_device *dev) | |||
158 | /* Find the input queue. */ | 158 | /* Find the input queue. */ |
159 | /* FIXME: This is why we want to wean off hvc: we do nothing | 159 | /* FIXME: This is why we want to wean off hvc: we do nothing |
160 | * when input comes in. */ | 160 | * when input comes in. */ |
161 | in_vq = vdev->config->find_vq(vdev, NULL); | 161 | in_vq = vdev->config->find_vq(vdev, 0, NULL); |
162 | if (IS_ERR(in_vq)) { | 162 | if (IS_ERR(in_vq)) { |
163 | err = PTR_ERR(in_vq); | 163 | err = PTR_ERR(in_vq); |
164 | goto free; | 164 | goto free; |
165 | } | 165 | } |
166 | 166 | ||
167 | out_vq = vdev->config->find_vq(vdev, NULL); | 167 | out_vq = vdev->config->find_vq(vdev, 1, NULL); |
168 | if (IS_ERR(out_vq)) { | 168 | if (IS_ERR(out_vq)) { |
169 | err = PTR_ERR(out_vq); | 169 | err = PTR_ERR(out_vq); |
170 | goto free_in_vq; | 170 | goto free_in_vq; |