* virtio: remove obsolete virtqueue_get_queue_index()
@ 2013-03-21 7:17 Rusty Russell
2013-03-21 9:01 ` Cornelia Huck
0 siblings, 1 reply; 4+ messages in thread
From: Rusty Russell @ 2013-03-21 7:17 UTC (permalink / raw)
To: mst, netdev, Cornelia Huck
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>
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 (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
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: virtio: remove obsolete virtqueue_get_queue_index()
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
0 siblings, 1 reply; 4+ messages in thread
From: Cornelia Huck @ 2013-03-21 9:01 UTC (permalink / raw)
To: Rusty Russell; +Cc: mst, netdev
On Thu, 21 Mar 2013 17:47:03 +1030
Rusty Russell <rusty@rustcorp.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@de.ibm.com>
> Signed-off-by: Rusty Russell <rusty@rustcorp.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;
> }
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: virtio: remove obsolete virtqueue_get_queue_index()
2013-03-21 9:01 ` Cornelia Huck
@ 2013-03-22 0:17 ` Rusty Russell
2013-03-22 9:10 ` Cornelia Huck
0 siblings, 1 reply; 4+ messages in thread
From: Rusty Russell @ 2013-03-22 0:17 UTC (permalink / raw)
To: Cornelia Huck; +Cc: mst, netdev
Cornelia Huck <cornelia.huck@de.ibm.com> writes:
> On Thu, 21 Mar 2013 17:47:03 +1030
> Rusty Russell <rusty@rustcorp.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@de.ibm.com>
>> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
...
>> @@ -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;
>> }
Thanks, fixed.
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>
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
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: virtio: remove obsolete virtqueue_get_queue_index()
2013-03-22 0:17 ` Rusty Russell
@ 2013-03-22 9:10 ` Cornelia Huck
0 siblings, 0 replies; 4+ messages in thread
From: Cornelia Huck @ 2013-03-22 9:10 UTC (permalink / raw)
To: Rusty Russell; +Cc: mst, netdev
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
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-03-22 9:10 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).