[PULL 0/1] KVM: s390: fix for 3.18-rc

[PULL 0/1] KVM: s390: fix for 3.18-rc

[Cornelia Huck]

Hi,

one fix for a build warning regression introduced during the merge
window with some virtio changes. Rusty wanted me to send this through
the kvm/s390 tree. Branch is against 3.18-rc3.

The following changes since commit 0df1f2487d2f0d04703f142813d53615d62a1da4:

  Linux 3.18-rc3 (2014-11-02 15:01:51 -0800)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git tags/kvm-s390-20141103

for you to fetch changes up to f7ceb0dfec43d2d4e2373d02968f8fb58c6858f7:

  KVM: s390: virtio_ccw: remove unused variable (2014-11-03 10:43:00 +0100)

----------------------------------------------------------------
Fix a build warning in virtio-ccw introduced during the merge window.

----------------------------------------------------------------

Sebastian Ott (1):
  KVM: s390: virtio_ccw: remove unused variable

 drivers/s390/kvm/virtio_ccw.c |    1 -
 1 file changed, 1 deletion(-)

-- 
1.7.9.5

[PULL 1/1] KVM: s390: virtio_ccw: remove unused variable

[Cornelia Huck]

From: Sebastian Ott <sebott@linux.vnet.ibm.com>

Fix this warning:
drivers/s390/kvm/virtio_ccw.c: In function ‘virtio_ccw_int_handler’:
drivers/s390/kvm/virtio_ccw.c:891:24: warning: unused variable ‘drv’ [-Wunused-variable]
    struct virtio_driver *drv;

Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
---
 drivers/s390/kvm/virtio_ccw.c |    1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/s390/kvm/virtio_ccw.c b/drivers/s390/kvm/virtio_ccw.c
index 6cbe6ef..bda52f1 100644
--- a/drivers/s390/kvm/virtio_ccw.c
+++ b/drivers/s390/kvm/virtio_ccw.c
@@ -888,7 +888,6 @@ static void virtio_ccw_int_handler(struct ccw_device *cdev,
 	struct virtio_ccw_device *vcdev = dev_get_drvdata(&cdev->dev);
 	int i;
 	struct virtqueue *vq;
-	struct virtio_driver *drv;
 
 	if (!vcdev)
 		return;
-- 
1.7.9.5

Re: [PULL 1/1] KVM: s390: virtio_ccw: remove unused variable

[Paolo Bonzini]

On 03/11/2014 12:29, Cornelia Huck wrote:
> From: Sebastian Ott <sebott@linux.vnet.ibm.com>
> 
> Fix this warning:
> drivers/s390/kvm/virtio_ccw.c: In function ‘virtio_ccw_int_handler’:
> drivers/s390/kvm/virtio_ccw.c:891:24: warning: unused variable ‘drv’ [-Wunused-variable]
>     struct virtio_driver *drv;
> 
> Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
> Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>
> Acked-by: Michael S. Tsirkin <mst@redhat.com>
> Acked-by: Rusty Russell <rusty@rustcorp.com.au>
> Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
> ---
>  drivers/s390/kvm/virtio_ccw.c |    1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/drivers/s390/kvm/virtio_ccw.c b/drivers/s390/kvm/virtio_ccw.c
> index 6cbe6ef..bda52f1 100644
> --- a/drivers/s390/kvm/virtio_ccw.c
> +++ b/drivers/s390/kvm/virtio_ccw.c
> @@ -888,7 +888,6 @@ static void virtio_ccw_int_handler(struct ccw_device *cdev,
>  	struct virtio_ccw_device *vcdev = dev_get_drvdata(&cdev->dev);
>  	int i;
>  	struct virtqueue *vq;
> -	struct virtio_driver *drv;
>  
>  	if (!vcdev)
>  		return;
> 

Pulled, thanks.

Paolo