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 /net | |
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 'net')
-rw-r--r-- | net/9p/trans_virtio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c index 40b71a29fc3..78d7946f81f 100644 --- a/net/9p/trans_virtio.c +++ b/net/9p/trans_virtio.c | |||
@@ -236,13 +236,13 @@ static int p9_virtio_probe(struct virtio_device *dev) | |||
236 | 236 | ||
237 | /* Find the input queue. */ | 237 | /* Find the input queue. */ |
238 | dev->priv = chan; | 238 | dev->priv = chan; |
239 | chan->in_vq = dev->config->find_vq(dev, p9_virtio_intr); | 239 | chan->in_vq = dev->config->find_vq(dev, 0, p9_virtio_intr); |
240 | if (IS_ERR(chan->in_vq)) { | 240 | if (IS_ERR(chan->in_vq)) { |
241 | err = PTR_ERR(chan->in_vq); | 241 | err = PTR_ERR(chan->in_vq); |
242 | goto free; | 242 | goto free; |
243 | } | 243 | } |
244 | 244 | ||
245 | chan->out_vq = dev->config->find_vq(dev, NULL); | 245 | chan->out_vq = dev->config->find_vq(dev, 1, NULL); |
246 | if (IS_ERR(chan->out_vq)) { | 246 | if (IS_ERR(chan->out_vq)) { |
247 | err = PTR_ERR(chan->out_vq); | 247 | err = PTR_ERR(chan->out_vq); |
248 | goto free_in_vq; | 248 | goto free_in_vq; |