Patchwork [for-1.1] virtio-blk: Fix unused variables in virtio_blk_handle_scsi()

login
register
mail settings
Submitter Andreas Färber
Date May 27, 2012, 2:41 p.m.
Message ID <1338129690-42835-1-git-send-email-andreas.faerber@web.de>
Download mbox | patch
Permalink /patch/161546/
State New
Headers show

Comments

Andreas Färber - May 27, 2012, 2:41 p.m.
Commit f34e73cd69bdbdb9b1d56b288c5e14d6fff58165 (virtio-blk: report
non-zero status when failing SG_IO requests) exposed the function
to non-Linux guests. Move all Linux-only variable declarations into
an #ifdef in the variable declaration block.

Signed-off-by: Andreas Färber <andreas.faerber@web.de>
Cc: Paolo Bonzini <pbonzini@redhat.com>
---
 hw/virtio-blk.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
Andreas Färber - May 27, 2012, 3:10 p.m.
Am 27.05.2012 16:41, schrieb Andreas Färber:
> Commit f34e73cd69bdbdb9b1d56b288c5e14d6fff58165 (virtio-blk: report
> non-zero status when failing SG_IO requests) exposed the function
> to non-Linux guests. Move all Linux-only variable declarations into

"hosts", obviously. Please fix when applying.

Thanks,
Andreas

> an #ifdef in the variable declaration block.
> 
> Signed-off-by: Andreas Färber <andreas.faerber@web.de>
> Cc: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  hw/virtio-blk.c |    6 ++++--
>  1 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c
> index f9e1896..a1b64cb 100644
> --- a/hw/virtio-blk.c
> +++ b/hw/virtio-blk.c
> @@ -147,9 +147,12 @@ static VirtIOBlockReq *virtio_blk_get_request(VirtIOBlock *s)
>  
>  static void virtio_blk_handle_scsi(VirtIOBlockReq *req)
>  {
> -    int ret;
>      int status = VIRTIO_BLK_S_OK;
> +#ifdef __linux__
> +    struct sg_io_hdr hdr;
> +    int ret;
>      int i;
> +#endif
>  
>      /*
>       * We require at least one output segment each for the virtio_blk_outhdr
> @@ -184,7 +187,6 @@ static void virtio_blk_handle_scsi(VirtIOBlockReq *req)
>      }
>  
>  #ifdef __linux__
> -    struct sg_io_hdr hdr;
>      memset(&hdr, 0, sizeof(struct sg_io_hdr));
>      hdr.interface_id = 'S';
>      hdr.cmd_len = req->elem.out_sg[1].iov_len;
Stefan Hajnoczi - May 28, 2012, 12:23 p.m.
On Sun, May 27, 2012 at 3:41 PM, Andreas Färber <andreas.faerber@web.de> wrote:
> Commit f34e73cd69bdbdb9b1d56b288c5e14d6fff58165 (virtio-blk: report
> non-zero status when failing SG_IO requests) exposed the function
> to non-Linux guests. Move all Linux-only variable declarations into
> an #ifdef in the variable declaration block.
>
> Signed-off-by: Andreas Färber <andreas.faerber@web.de>
> Cc: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  hw/virtio-blk.c |    6 ++++--
>  1 files changed, 4 insertions(+), 2 deletions(-)

Reviewed-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>

Patch

diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c
index f9e1896..a1b64cb 100644
--- a/hw/virtio-blk.c
+++ b/hw/virtio-blk.c
@@ -147,9 +147,12 @@  static VirtIOBlockReq *virtio_blk_get_request(VirtIOBlock *s)
 
 static void virtio_blk_handle_scsi(VirtIOBlockReq *req)
 {
-    int ret;
     int status = VIRTIO_BLK_S_OK;
+#ifdef __linux__
+    struct sg_io_hdr hdr;
+    int ret;
     int i;
+#endif
 
     /*
      * We require at least one output segment each for the virtio_blk_outhdr
@@ -184,7 +187,6 @@  static void virtio_blk_handle_scsi(VirtIOBlockReq *req)
     }
 
 #ifdef __linux__
-    struct sg_io_hdr hdr;
     memset(&hdr, 0, sizeof(struct sg_io_hdr));
     hdr.interface_id = 'S';
     hdr.cmd_len = req->elem.out_sg[1].iov_len;