From: Cornelia Huck <cornelia.huck@de.ibm.com>
To: Rusty Russell <rusty@rustcorp.com.au>
Cc: mst@redhat.com, netdev@vger.kernel.org
Subject: Re: virtio: remove obsolete virtqueue_get_queue_index()
Date: Fri, 22 Mar 2013 10:10:09 +0100 [thread overview]
Message-ID: <20130322101009.6076b0ba@gondolin> (raw)
In-Reply-To: <87ehf8fftt.fsf@rustcorp.com.au>
On Fri, 22 Mar 2013 10:47:34 +1030
Rusty Russell <rusty@rustcorp.com.au> wrote:
> virtio: remove obsolete virtqueue_get_queue_index()
>
> 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@de.ibm.com>
Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>
> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
>
> diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
> index d88d436..24fc9f5 100644
> --- a/drivers/net/virtio_net.c
> +++ b/drivers/net/virtio_net.c
> @@ -153,7 +153,7 @@ struct padded_vnet_hdr {
> */
> static int vq2txq(struct virtqueue *vq)
> {
> - return (virtqueue_get_queue_index(vq) - 1) / 2;
> + return (vq->index - 1) / 2;
> }
>
> static int txq2vq(int txq)
> @@ -163,7 +163,7 @@ static int txq2vq(int txq)
>
> static int vq2rxq(struct virtqueue *vq)
> {
> - return virtqueue_get_queue_index(vq) / 2;
> + return vq->index / 2;
> }
>
> static int rxq2vq(int rxq)
> 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 (info->vq->index == index) {
> vq = info->vq;
> break;
> }
> diff --git a/include/linux/virtio.h b/include/linux/virtio.h
> index 833f17b..9ff8645 100644
> --- a/include/linux/virtio.h
> +++ b/include/linux/virtio.h
> @@ -76,12 +76,6 @@ void *virtqueue_detach_unused_buf(struct virtqueue *vq);
>
> unsigned int virtqueue_get_vring_size(struct virtqueue *vq);
>
> -/* FIXME: Obsolete accessor, but required for virtio_net merge. */
> -static inline unsigned int virtqueue_get_queue_index(struct virtqueue *vq)
> -{
> - return vq->index;
> -}
> -
> /**
> * virtio_device - representation of a device using virtio
> * @index: unique position on the virtio bus
>
prev parent reply other threads:[~2013-03-22 9:10 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-21 7:17 virtio: remove obsolete virtqueue_get_queue_index() Rusty Russell
2013-03-21 9:01 ` Cornelia Huck
2013-03-22 0:17 ` Rusty Russell
2013-03-22 9:10 ` Cornelia Huck [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130322101009.6076b0ba@gondolin \
--to=cornelia.huck@de.ibm.com \
--cc=mst@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=rusty@rustcorp.com.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.