linux-next: build failure after merge of the virtio tree

linux-next: build failure after merge of the virtio tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1583 bytes --]

Hi Rusty,

After merging the virtio tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/net/virtio_net.c: In function 'vq2txq':
drivers/net/virtio_net.c:150:2: error: implicit declaration of function 'virtqueue_get_queue_index' [-Werror=implicit-function-declaration]

Caused by commit 986a4f4d452d ("virtio_net: multiqueue support") from the
net-next tree interacting with commit 105e892960e1 ("virtio: move
queue_index and num_free fields into core struct virtqueue") from the
virtio tree.

I applied the patch below and can carry it as necessary.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 10 Dec 2012 13:33:57 +1100
Subject: [PATCH] virtnet: for up for virtqueue_get_queue_index removal

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/net/virtio_net.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 33d6f6f..8afe32d 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -147,7 +147,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)
@@ -157,7 +157,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)
-- 
1.7.10.280.gaa39

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: build failure after merge of the virtio tree

[Rusty Russell]

Stephen Rothwell <sfr@canb.auug.org.au> writes:

> Hi Rusty,
>
> After merging the virtio tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/net/virtio_net.c: In function 'vq2txq':
> drivers/net/virtio_net.c:150:2: error: implicit declaration of function 'virtqueue_get_queue_index' [-Werror=implicit-function-declaration]
>
> Caused by commit 986a4f4d452d ("virtio_net: multiqueue support") from the
> net-next tree interacting with commit 105e892960e1 ("virtio: move
> queue_index and num_free fields into core struct virtqueue") from the
> virtio tree.
>
> I applied the patch below and can carry it as necessary.

Thanks for this, your fix is correct.

Cheers,
Rusty.

linux-next: build failure after merge of the virtio tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 829 bytes --]

Hi Rusty,

After merging the virtio tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/virtio/virtio_mmio.c:250:12: error: redefinition of 'vm_generation'
 static u32 vm_generation(struct virtio_device *vdev)
            ^
drivers/virtio/virtio_mmio.c:240:12: note: previous definition of 'vm_generation' was here
 static u32 vm_generation(struct virtio_device *vdev)
            ^

Caused by the bad merge of commits 87e7bf1450c9 ("virtio_mmio:
generation support") from Linus' tree and cf02b2c2d1a1 ("virtio_mmio:
generation support") from the virtio tree.

I fixed it up by removing the second version of that function.

Could the virtio tree should be cleaned up to match what was sent to
Linus, please?
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: build failure after merge of the virtio tree

[Rusty Russell]

Stephen Rothwell <sfr@canb.auug.org.au> writes:
> Hi Rusty,
>
> After merging the virtio tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/virtio/virtio_mmio.c:250:12: error: redefinition of 'vm_generation'
>  static u32 vm_generation(struct virtio_device *vdev)
>             ^
> drivers/virtio/virtio_mmio.c:240:12: note: previous definition of 'vm_generation' was here
>  static u32 vm_generation(struct virtio_device *vdev)
>             ^
>
> Caused by the bad merge of commits 87e7bf1450c9 ("virtio_mmio:
> generation support") from Linus' tree and cf02b2c2d1a1 ("virtio_mmio:
> generation support") from the virtio tree.
>
> I fixed it up by removing the second version of that function.
>
> Could the virtio tree should be cleaned up to match what was sent to
> Linus, please?

Sorry, I clearly missed the failed push to virtio-next after I rebased a
fix.

Fixed now; I've modified my for-linus script to push to korg first
(which should be a noop).

Thanks,
Rusty.