[Qemu-devel] [PULL 0/2] SCSI changes for 2.0

[Qemu-devel] [PULL 0/2] SCSI changes for 2.0

[Paolo Bonzini]

Peter,

The following changes since commit 7f6613cedc59fa849105668ae971dc31004bca1c:

  target-mips: fix MTHC1 and MFHC1 when FPU in FR=0 mode (2014-03-25 23:36:35 +0100)

are available in the git repository at:

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

for you to fetch changes up to ec8929a55512606456e364ffa80586219f67c904:

  spapr_vscsi: remove duplicate condition check (2014-03-26 13:19:22 +0100)

Two one-line fixes for issues detected by static analysis.

----------------------------------------------------------------
Prasad Joshi (2):
      scsi: check req pointer before dereferencing it
      spapr_vscsi: remove duplicate condition check

 hw/scsi/spapr_vscsi.c | 2 +-
 hw/scsi/vmw_pvscsi.c  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
-- 
1.8.5.3

[Qemu-devel] [PULL 1/2] scsi: check req pointer before dereferencing it

[Paolo Bonzini]

From: Prasad Joshi <prasadjoshi.linux@gmail.com>

Signed-off-by: Prasad Joshi <prasadjoshi.linux@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 hw/scsi/vmw_pvscsi.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hw/scsi/vmw_pvscsi.c b/hw/scsi/vmw_pvscsi.c
index 7d344b9..e35bff7 100644
--- a/hw/scsi/vmw_pvscsi.c
+++ b/hw/scsi/vmw_pvscsi.c
@@ -479,12 +479,13 @@ static void
 pvscsi_command_complete(SCSIRequest *req, uint32_t status, size_t resid)
 {
     PVSCSIRequest *pvscsi_req = req->hba_private;
-    PVSCSIState *s = pvscsi_req->dev;
+    PVSCSIState *s;
 
     if (!pvscsi_req) {
         trace_pvscsi_command_complete_not_found(req->tag);
         return;
     }
+    s = pvscsi_req->dev;
 
     if (resid) {
         /* Short transfer.  */
-- 
1.8.5.3

[Qemu-devel] [PULL 2/2] spapr_vscsi: remove duplicate condition check

[Paolo Bonzini]

From: Prasad Joshi <prasadjoshi.linux@gmail.com>

Signed-off-by: Prasad Joshi <prasadjoshi.linux@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 hw/scsi/spapr_vscsi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/scsi/spapr_vscsi.c b/hw/scsi/spapr_vscsi.c
index 34478f0..d4ada4f 100644
--- a/hw/scsi/spapr_vscsi.c
+++ b/hw/scsi/spapr_vscsi.c
@@ -690,7 +690,7 @@ static void vscsi_inquiry_no_target(VSCSIState *s, vscsi_req *req)
     int rc, len, alen;
 
     /* We dont do EVPD. Also check that page_code is 0 */
-    if ((cdb[1] & 0x01) || (cdb[1] & 0x01) || cdb[2] != 0) {
+    if ((cdb[1] & 0x01) || cdb[2] != 0) {
         /* Send INVALID FIELD IN CDB */
         vscsi_makeup_sense(s, req, ILLEGAL_REQUEST, 0x24, 0);
         vscsi_send_rsp(s, req, CHECK_CONDITION, 0, 0);
-- 
1.8.5.3

Re: [Qemu-devel] [PULL 0/2] SCSI changes for 2.0

[Peter Maydell]

On 26 March 2014 12:21, Paolo Bonzini <pbonzini@redhat.com> wrote:
> Peter,
>
> The following changes since commit 7f6613cedc59fa849105668ae971dc31004bca1c:
>
>   target-mips: fix MTHC1 and MFHC1 when FPU in FR=0 mode (2014-03-25 23:36:35 +0100)
>
> are available in the git repository at:
>
>   git://github.com/bonzini/qemu.git scsi-next
>
> for you to fetch changes up to ec8929a55512606456e364ffa80586219f67c904:
>
>   spapr_vscsi: remove duplicate condition check (2014-03-26 13:19:22 +0100)
>
> Two one-line fixes for issues detected by static analysis.

Applied, thanks.

-- PMM