[PATCH] drivers: virtio: Make out_del_vqs dependent on BALLOON_COMPACTION

[PATCH] drivers: virtio: Make out_del_vqs dependent on BALLOON_COMPACTION

[Vincenzo Frascino]

out_del_vqs label is currently used only when BALLOON_COMPACTION
configuration option is enabled. Having it disabled triggers the
following warning at compile time:

drivers/virtio/virtio_balloon.c: In function ‘virtballoon_probe’:
drivers/virtio/virtio_balloon.c:963:1: warning: label ‘out_del_vqs’
defined but not used [-Wunused-label]
  963 | out_del_vqs:
      | ^~~~~~~~~~~

Make out_del_vqs dependent on BALLOON_COMPACTION to address the
issue.

Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Jason Wang <jasowang@redhat.com>
Signed-off-by: Vincenzo Frascino <vincenzo.frascino@arm.com>
---
 drivers/virtio/virtio_balloon.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c
index 7bfe365d9372..341458fd95ca 100644
--- a/drivers/virtio/virtio_balloon.c
+++ b/drivers/virtio/virtio_balloon.c
@@ -959,8 +959,8 @@ static int virtballoon_probe(struct virtio_device *vdev)
 	iput(vb->vb_dev_info.inode);
 out_kern_unmount:
 	kern_unmount(balloon_mnt);
-#endif
 out_del_vqs:
+#endif
 	vdev->config->del_vqs(vdev);
 out_free_vb:
 	kfree(vb);
-- 
2.25.1

Re: [PATCH] drivers: virtio: Make out_del_vqs dependent on BALLOON_COMPACTION

[David Hildenbrand]

> Am 06.03.2020 um 11:56 schrieb Vincenzo Frascino <vincenzo.frascino@arm.com>:
> 
> out_del_vqs label is currently used only when BALLOON_COMPACTION
> configuration option is enabled. Having it disabled triggers the
> following warning at compile time:
> 
> drivers/virtio/virtio_balloon.c: In function ‘virtballoon_probe’:
> drivers/virtio/virtio_balloon.c:963:1: warning: label ‘out_del_vqs’
> defined but not used [-Wunused-label]
>  963 | out_del_vqs:
>      | ^~~~~~~~~~~
> 
> Make out_del_vqs dependent on BALLOON_COMPACTION to address the
> issue.
> 
> Cc: "Michael S. Tsirkin" <mst@redhat.com>
> Cc: Jason Wang <jasowang@redhat.com>
> Signed-off-by: Vincenzo Frascino <vincenzo.frascino@arm.com>

I think this is now the third patch on the list that tries to fix this warning.

Michael, can we finally queue one of these (or is there one in -next already - did not check)?

Thanks

Re: [PATCH] drivers: virtio: Make out_del_vqs dependent on BALLOON_COMPACTION

[Michael S. Tsirkin]

On Sun, Mar 08, 2020 at 08:38:19PM +0100, David Hildenbrand wrote:
> 
> 
> > Am 06.03.2020 um 11:56 schrieb Vincenzo Frascino <vincenzo.frascino@arm.com>:
> > 
> > out_del_vqs label is currently used only when BALLOON_COMPACTION
> > configuration option is enabled. Having it disabled triggers the
> > following warning at compile time:
> > 
> > drivers/virtio/virtio_balloon.c: In function ‘virtballoon_probe’:
> > drivers/virtio/virtio_balloon.c:963:1: warning: label ‘out_del_vqs’
> > defined but not used [-Wunused-label]
> >  963 | out_del_vqs:
> >      | ^~~~~~~~~~~
> > 
> > Make out_del_vqs dependent on BALLOON_COMPACTION to address the
> > issue.
> > 
> > Cc: "Michael S. Tsirkin" <mst@redhat.com>
> > Cc: Jason Wang <jasowang@redhat.com>
> > Signed-off-by: Vincenzo Frascino <vincenzo.frascino@arm.com>
> 
> I think this is now the third patch on the list that tries to fix this warning.
> 
> Michael, can we finally queue one of these (or is there one in -next already - did not check)?
> 
> Thanks

It's queued in my tree (and will be in next eventually), I just didn't
send it to Linus yet.
Sorry about the delay.

-- 
MST