diff options
author | Michael S. Tsirkin <mst@redhat.com> | 2009-06-13 00:16:36 -0400 |
---|---|---|
committer | Rusty Russell <rusty@rustcorp.com.au> | 2009-06-12 08:46:36 -0400 |
commit | d2a7ddda9ffb1c8961abff6714b0f1eb925c120f (patch) | |
tree | 1090884fd260d042255255467367e4e6b6193e5d /net/9p | |
parent | 9499f5e7ed5224c40706f0cec6542a9916bc7606 (diff) |
virtio: find_vqs/del_vqs virtio operations
This replaces find_vq/del_vq with find_vqs/del_vqs virtio operations,
and updates all drivers. This is needed for MSI support, because MSI
needs to know the total number of vectors upfront.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> (+ lguest/9p compile fixes)
Diffstat (limited to 'net/9p')
-rw-r--r-- | net/9p/trans_virtio.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c index ab8791f9aba..a49484e67e1 100644 --- a/net/9p/trans_virtio.c +++ b/net/9p/trans_virtio.c | |||
@@ -246,7 +246,7 @@ static int p9_virtio_probe(struct virtio_device *vdev) | |||
246 | chan->vdev = vdev; | 246 | chan->vdev = vdev; |
247 | 247 | ||
248 | /* We expect one virtqueue, for requests. */ | 248 | /* We expect one virtqueue, for requests. */ |
249 | chan->vq = vdev->config->find_vq(vdev, 0, req_done, "requests"); | 249 | chan->vq = virtio_find_single_vq(vdev, req_done, "requests"); |
250 | if (IS_ERR(chan->vq)) { | 250 | if (IS_ERR(chan->vq)) { |
251 | err = PTR_ERR(chan->vq); | 251 | err = PTR_ERR(chan->vq); |
252 | goto out_free_vq; | 252 | goto out_free_vq; |
@@ -261,7 +261,7 @@ static int p9_virtio_probe(struct virtio_device *vdev) | |||
261 | return 0; | 261 | return 0; |
262 | 262 | ||
263 | out_free_vq: | 263 | out_free_vq: |
264 | vdev->config->del_vq(chan->vq); | 264 | vdev->config->del_vqs(vdev); |
265 | fail: | 265 | fail: |
266 | mutex_lock(&virtio_9p_lock); | 266 | mutex_lock(&virtio_9p_lock); |
267 | chan_index--; | 267 | chan_index--; |
@@ -332,7 +332,7 @@ static void p9_virtio_remove(struct virtio_device *vdev) | |||
332 | BUG_ON(chan->inuse); | 332 | BUG_ON(chan->inuse); |
333 | 333 | ||
334 | if (chan->initialized) { | 334 | if (chan->initialized) { |
335 | vdev->config->del_vq(chan->vq); | 335 | vdev->config->del_vqs(vdev); |
336 | chan->initialized = false; | 336 | chan->initialized = false; |
337 | } | 337 | } |
338 | } | 338 | } |