[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20130321100146.7a741c75@gondolin>
Date: Thu, 21 Mar 2013 10:01:46 +0100
From: Cornelia Huck <cornelia.huck@...ibm.com>
To: Rusty Russell <rusty@...tcorp.com.au>
Cc: <mst@...hat.com>, <netdev@...r.kernel.org>
Subject: Re: virtio: remove obsolete virtqueue_get_queue_index()
On Thu, 21 Mar 2013 17:47:03 +1030
Rusty Russell <rusty@...tcorp.com.au> wrote:
> You can access it directly now, since 3.8: v3.7-rc1-13-g06ca287
> 'virtio: move queue_index and num_free fields into core struct
> virtqueue.'
>
> Cc: Cornelia Huck <cornelia.huck@...ibm.com>
> Signed-off-by: Rusty Russell <rusty@...tcorp.com.au>
>
> diff --git a/drivers/s390/kvm/virtio_ccw.c b/drivers/s390/kvm/virtio_ccw.c
> index 2029b6c..a7eddc7 100644
> --- a/drivers/s390/kvm/virtio_ccw.c
> +++ b/drivers/s390/kvm/virtio_ccw.c
> @@ -166,7 +166,7 @@ static void virtio_ccw_kvm_notify(struct virtqueue *vq)
>
> vcdev = to_vc_device(info->vq->vdev);
> ccw_device_get_schid(vcdev->cdev, &schid);
> - do_kvm_notify(schid, virtqueue_get_queue_index(vq));
> + do_kvm_notify(schid, vq->index);
> }
>
> static int virtio_ccw_read_vq_conf(struct virtio_ccw_device *vcdev,
> @@ -188,7 +188,7 @@ static void virtio_ccw_del_vq(struct virtqueue *vq, struct ccw1 *ccw)
> unsigned long flags;
> unsigned long size;
> int ret;
> - unsigned int index = virtqueue_get_queue_index(vq);
> + unsigned int index = vq->index;
>
> /* Remove from our list. */
> spin_lock_irqsave(&vcdev->lock, flags);
> @@ -610,7 +610,7 @@ static struct virtqueue *virtio_ccw_vq_by_ind(struct virtio_ccw_device *vcdev,
> vq = NULL;
> spin_lock_irqsave(&vcdev->lock, flags);
> list_for_each_entry(info, &vcdev->virtqueues, node) {
> - if (virtqueue_get_queue_index(info->vq) == index) {
> + if (vq->index == index) {
Should be
if (info->vq->index == index) {
> vq = info->vq;
> break;
> }
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists