qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: Paul Janzen <pcj@pauljanzen.org>
Subject: [Qemu-devel] [PULL 04/14] scsi-disk.c: Fix compilation with -DDEBUG_SCSI
Date: Wed, 18 Jun 2014 15:26:44 +0200	[thread overview]
Message-ID: <1403098014-1522-5-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1403098014-1522-1-git-send-email-pbonzini@redhat.com>

From: Paul Janzen <pcj@pauljanzen.org>

In scsi-disk.c, if you #define DEBUG_SCSI=1, you get:
hw/scsi/scsi-disk.c: In function 'scsi_disk_emulate_command':
hw/scsi/scsi-disk.c:2018: error: 'SCSIRequest' has no member named 'buf'

Change the debugging statement to match the actual value tested.

Signed-off-by: Paul Janzen <pcj@pauljanzen.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 hw/scsi/scsi-disk.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c
index fc6e32a..9afbb8a 100644
--- a/hw/scsi/scsi-disk.c
+++ b/hw/scsi/scsi-disk.c
@@ -2015,7 +2015,7 @@ static int32_t scsi_disk_emulate_command(SCSIRequest *req, uint8_t *buf)
     case VERIFY_10:
     case VERIFY_12:
     case VERIFY_16:
-        DPRINTF("Verify (bytchk %lu)\n", (r->req.buf[1] >> 1) & 3);
+        DPRINTF("Verify (bytchk %d)\n", (req->cmd.buf[1] >> 1) & 3);
         if (req->cmd.buf[1] & 6) {
             goto illegal_request;
         }
-- 
1.8.3.1

  parent reply	other threads:[~2014-06-18 13:27 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-06-18 13:26 [Qemu-devel] [PULL 00/14] SCSI changes for 2014-06-18 Paolo Bonzini
2014-06-18 13:26 ` [Qemu-devel] [PULL 01/14] block/iscsi: handle BUSY condition Paolo Bonzini
2014-06-18 13:26 ` [Qemu-devel] [PULL 02/14] block/iscsi: fix potential segfault on early callback Paolo Bonzini
2014-06-18 13:26 ` [Qemu-devel] [PULL 03/14] block/iscsi: use 16 byte CDBs only when necessary Paolo Bonzini
2014-06-18 13:26 ` Paolo Bonzini [this message]
2014-06-18 13:26 ` [Qemu-devel] [PULL 05/14] scsi-disk: fix bug in scsi_block_new_request() introduced by commit 137745c Paolo Bonzini
2014-06-18 13:26 ` [Qemu-devel] [PULL 06/14] scsi: Print command name in debug Paolo Bonzini
2014-06-18 13:26 ` [Qemu-devel] [PULL 07/14] megasas: use PCI DMA API Paolo Bonzini
2014-06-18 13:26 ` [Qemu-devel] [PULL 08/14] util: add return value to qemu_iovec_concat_iov Paolo Bonzini
2014-06-18 13:26 ` [Qemu-devel] [PULL 09/14] virtio-scsi: start preparing for any_layout Paolo Bonzini
2014-06-18 13:26 ` [Qemu-devel] [PULL 10/14] virtio-scsi: add target swap for VirtIOSCSICtrlTMFReq fields Paolo Bonzini
2014-06-18 13:26 ` [Qemu-devel] [PULL 11/14] virtio-scsi: add extra argument and return type to qemu_sgl_concat Paolo Bonzini
2014-06-18 13:26 ` [Qemu-devel] [PULL 12/14] virtio-scsi: prepare sense data handling for any_layout Paolo Bonzini
2014-06-18 13:26 ` [Qemu-devel] [PULL 13/14] virtio-scsi: introduce virtio_scsi_complete_cmd_req Paolo Bonzini
2014-06-18 13:26 ` [Qemu-devel] [PULL 14/14] virtio-scsi: add support for the any_layout feature Paolo Bonzini
2014-06-18 15:30 ` [Qemu-devel] [PULL 00/14] SCSI changes for 2014-06-18 Peter Maydell
2014-06-18 15:47   ` Paolo Bonzini
2014-06-18 15:53     ` Peter Maydell
2014-06-18 15:57       ` Paolo Bonzini
2014-06-18 16:06         ` ronnie sahlberg
2014-06-18 16:07           ` Paolo Bonzini

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1403098014-1522-5-git-send-email-pbonzini@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=pcj@pauljanzen.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).