[Qemu-devel] [PULL 00/15] SCSI changes for 2014-05-20

[Qemu-devel] [PULL 00/15] SCSI changes for 2014-05-20

[Paolo Bonzini]

Peter,

The following changes since commit 6a86dec61921163b6ab582df988416a6f0ca0ed5:

  [PATCH] block/iscsi: bump year in copyright notice (2014-05-05 10:04:30 +0200)

are available in the git repository at:

  git://github.com/bonzini/qemu.git scsi-next

for you to fetch changes up to 5a7733b0b728bb4900bdeed12fef22651ce0ab58:

  megasas: remove buildtime strings (2014-05-20 16:14:29 +0200)

Yesterday's pull request had a problem with old libiscsi, so I am sending
another one.  Sorry for the inconvenience.

----------------------------------------------------------------
Jeff Cody (1):
      block: iscsi build fix if LIBISCSI_FEATURE_IOVECTOR is not defined

Markus Armbruster (2):
      scsi: Document intentional fall through in scsi_req_length()
      virtio-scsi: Plug memory leak on virtio_scsi_push_event() error path

Olaf Hering (1):
      megasas: remove buildtime strings

 block/iscsi.c         | 4 +---
 hw/scsi/megasas.c     | 4 ++--
 hw/scsi/scsi-bus.c    | 2 ++
 hw/scsi/virtio-scsi.c | 3 ++-
 4 files changed, 7 insertions(+), 6 deletions(-)
-- 
1.8.3.1

[Qemu-devel] [PULL 1/4] scsi: Document intentional fall through in scsi_req_length()

[Paolo Bonzini]

From: Markus Armbruster <armbru@redhat.com>

For clarity, and to hush up Coverity.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 hw/scsi/scsi-bus.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c
index ae921a6..26770fb 100644
--- a/hw/scsi/scsi-bus.c
+++ b/hw/scsi/scsi-bus.c
@@ -938,6 +938,7 @@ static int scsi_req_length(SCSICommand *cmd, SCSIDevice *dev, uint8_t *buf)
         if (cmd->xfer == 0) {
             cmd->xfer = 256;
         }
+        /* fall through */
     case WRITE_10:
     case WRITE_VERIFY_10:
     case WRITE_12:
@@ -952,6 +953,7 @@ static int scsi_req_length(SCSICommand *cmd, SCSIDevice *dev, uint8_t *buf)
         if (cmd->xfer == 0) {
             cmd->xfer = 256;
         }
+        /* fall through */
     case READ_10:
     case RECOVER_BUFFERED_DATA:
     case READ_12:
-- 
1.8.3.1

[Qemu-devel] [PULL 2/4] virtio-scsi: Plug memory leak on virtio_scsi_push_event() error path

[Paolo Bonzini]

From: Markus Armbruster <armbru@redhat.com>

Spotted by Coverity.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Cc: qemu-stable@nongnu.org
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 hw/scsi/virtio-scsi.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c
index b0d7517..91a62ce 100644
--- a/hw/scsi/virtio-scsi.c
+++ b/hw/scsi/virtio-scsi.c
@@ -489,7 +489,7 @@ static void virtio_scsi_push_event(VirtIOSCSI *s, SCSIDevice *dev,
                                    uint32_t event, uint32_t reason)
 {
     VirtIOSCSICommon *vs = VIRTIO_SCSI_COMMON(s);
-    VirtIOSCSIReq *req = virtio_scsi_pop_req(s, vs->event_vq);
+    VirtIOSCSIReq *req;
     VirtIOSCSIEvent *evt;
     VirtIODevice *vdev = VIRTIO_DEVICE(s);
     int in_size;
@@ -498,6 +498,7 @@ static void virtio_scsi_push_event(VirtIOSCSI *s, SCSIDevice *dev,
         return;
     }
 
+    req = virtio_scsi_pop_req(s, vs->event_vq);
     if (!req) {
         s->events_dropped = true;
         return;
-- 
1.8.3.1

[Qemu-devel] [PULL 3/4] block: iscsi build fix if LIBISCSI_FEATURE_IOVECTOR is not defined

[Paolo Bonzini]

From: Jeff Cody <jcody@redhat.com>

Commit b03c380 introduced the function
iscsi_allocationmap_is_allocated(), however it is only used within a
code block that is conditionally compiled.  This produces a warning
(error with -werror) of "defined but not used" for the the function, if
LIBISCSI_FEATURE_IOVECTOR is not defined.

This wraps iscsi_allocationmap_is_allocated() in the same conditional.

Signed-off-by: Jeff Cody <jcody@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 block/iscsi.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/block/iscsi.c b/block/iscsi.c
index 65bf97d..1b4af77 100644
--- a/block/iscsi.c
+++ b/block/iscsi.c
@@ -381,6 +381,7 @@ retry:
 }
 
 
+#if defined(LIBISCSI_FEATURE_IOVECTOR)
 static bool iscsi_allocationmap_is_allocated(IscsiLun *iscsilun,
                                              int64_t sector_num, int nb_sectors)
 {
@@ -393,9 +394,6 @@ static bool iscsi_allocationmap_is_allocated(IscsiLun *iscsilun,
                            sector_num / iscsilun->cluster_sectors) == size);
 }
 
-
-#if defined(LIBISCSI_FEATURE_IOVECTOR)
-
 static int64_t coroutine_fn iscsi_co_get_block_status(BlockDriverState *bs,
                                                   int64_t sector_num,
                                                   int nb_sectors, int *pnum)
-- 
1.8.3.1

[Qemu-devel] [PULL 4/4] megasas: remove buildtime strings

[Paolo Bonzini]

From: Olaf Hering <olaf@aepfle.de>

Using __DATE__ or __TIME__ in binary pkgs changes the checksum of
compiled binaries if they get rebuilt, even if there are no other
source changes.  Replace the dynamic strings with some equally
informative static strings.

Signed-off-by: Olaf Hering <olaf@aepfle.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 hw/scsi/megasas.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c
index baee46f..0e109a2 100644
--- a/hw/scsi/megasas.c
+++ b/hw/scsi/megasas.c
@@ -728,8 +728,8 @@ static int megasas_ctrl_get_info(MegasasState *s, MegasasCmd *cmd)
     snprintf(info.package_version, 0x60, "%s-QEMU", QEMU_VERSION);
     memcpy(info.image_component[0].name, "APP", 3);
     memcpy(info.image_component[0].version, MEGASAS_VERSION "-QEMU", 9);
-    memcpy(info.image_component[0].build_date, __DATE__, 11);
-    memcpy(info.image_component[0].build_time, __TIME__, 8);
+    memcpy(info.image_component[0].build_date, "Apr  1 2014", 11);
+    memcpy(info.image_component[0].build_time, "12:34:56", 8);
     info.image_component_count = 1;
     if (pci_dev->has_rom) {
         uint8_t biosver[32];
-- 
1.8.3.1

Re: [Qemu-devel] [PULL 00/15] SCSI changes for 2014-05-20

[Peter Maydell]

On 20 May 2014 19:14, Paolo Bonzini <pbonzini@redhat.com> wrote:
> Peter,
>
> The following changes since commit 6a86dec61921163b6ab582df988416a6f0ca0ed5:
>
>   [PATCH] block/iscsi: bump year in copyright notice (2014-05-05 10:04:30 +0200)
>
> are available in the git repository at:
>
>   git://github.com/bonzini/qemu.git scsi-next
>
> for you to fetch changes up to 5a7733b0b728bb4900bdeed12fef22651ce0ab58:
>
>   megasas: remove buildtime strings (2014-05-20 16:14:29 +0200)
>
> Yesterday's pull request had a problem with old libiscsi, so I am sending
> another one.  Sorry for the inconvenience.
>
> ----------------------------------------------------------------
> Jeff Cody (1):
>       block: iscsi build fix if LIBISCSI_FEATURE_IOVECTOR is not defined
>
> Markus Armbruster (2):
>       scsi: Document intentional fall through in scsi_req_length()
>       virtio-scsi: Plug memory leak on virtio_scsi_push_event() error path
>
> Olaf Hering (1):
>       megasas: remove buildtime strings

How did you contrive a Subject claiming 00/15 with only four
patches? Anyway, applied :-)

thanks
-- PMM

Re: [Qemu-devel] [PULL 00/15] SCSI changes for 2014-05-20

[Paolo Bonzini]

Il 22/05/2014 17:13, Peter Maydell ha scritto:
> How did you contrive a Subject claiming 00/15 with only four
> patches? Anyway, applied :-)

I figured it was simpler to reuse the subject for the previous pull 
request, since the only thing that changed would be the day of the month.

Oh wait.

Paolo