[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/3] scsi debug: print command name in debug
From: |
Alexey Kardashevskiy |
Subject: |
[Qemu-devel] [PATCH 3/3] scsi debug: print command name in debug |
Date: |
Wed, 4 Dec 2013 15:55:25 +1100 |
This makes scsi_command_name() public.
This makes use of scsi_command_name() in debug output for scsi-disk and
spapr-vscsi host bus adapter.
Signed-off-by: Alexey Kardashevskiy <address@hidden>
---
hw/scsi/scsi-bus.c | 5 ++++-
hw/scsi/scsi-disk.c | 3 ++-
hw/scsi/spapr_vscsi.c | 5 +++--
include/block/scsi.h | 2 ++
4 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c
index ea916d1..5bf9544 100644
--- a/hw/scsi/scsi-bus.c
+++ b/hw/scsi/scsi-bus.c
@@ -1399,7 +1399,7 @@ int scsi_build_sense(uint8_t *in_buf, int in_len,
}
}
-static const char *scsi_command_name(uint8_t cmd)
+const char *scsi_command_name(uint8_t cmd)
{
static const char *names[] = {
[ TEST_UNIT_READY ] = "TEST_UNIT_READY",
@@ -1515,6 +1515,9 @@ static const char *scsi_command_name(uint8_t cmd)
[ SET_READ_AHEAD ] = "SET_READ_AHEAD",
[ ALLOW_OVERWRITE ] = "ALLOW_OVERWRITE",
[ MECHANISM_STATUS ] = "MECHANISM_STATUS",
+
+ [ GET_EVENT_STATUS_NOTIFICATION ] = "GET_EVENT_STATUS_NOTIFICATION",
+ [ READ_DISC_INFORMATION ] = "READ_DISC_INFORMATION",
};
if (cmd >= ARRAY_SIZE(names) || names[cmd] == NULL)
diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c
index 22b6859..d6cea68 100644
--- a/hw/scsi/scsi-disk.c
+++ b/hw/scsi/scsi-disk.c
@@ -1865,7 +1865,8 @@ static int32_t scsi_disk_emulate_command(SCSIRequest
*req, uint8_t *buf)
scsi_aio_complete, r);
return 0;
default:
- DPRINTF("Unknown SCSI command (%2.2x)\n", buf[0]);
+ DPRINTF("Unknown SCSI command (%2.2x=%s)\n", buf[0],
+ scsi_command_name(buf[0]));
scsi_check_condition(r, SENSE_CODE(INVALID_OPCODE));
return 0;
}
diff --git a/hw/scsi/spapr_vscsi.c b/hw/scsi/spapr_vscsi.c
index c0c46d7..d5d18f9 100644
--- a/hw/scsi/spapr_vscsi.c
+++ b/hw/scsi/spapr_vscsi.c
@@ -741,8 +741,9 @@ static int vscsi_queue_cmd(VSCSIState *s, vscsi_req *req)
req->sreq = scsi_req_new(sdev, req->qtag, lun, srp->cmd.cdb, req);
n = scsi_req_enqueue(req->sreq);
- DPRINTF("VSCSI: Queued command tag 0x%x CMD 0x%x LUN %d ret: %d\n",
- req->qtag, srp->cmd.cdb[0], lun, n);
+ DPRINTF("VSCSI: Queued command tag 0x%x CMD 0x%x=%s LUN %d ret: %d\n",
+ req->qtag, srp->cmd.cdb[0], scsi_command_name(srp->cmd.cdb[0]),
+ lun, n);
if (n) {
/* Transfer direction must be set before preprocessing the
diff --git a/include/block/scsi.h b/include/block/scsi.h
index 9ab045b..edde960 100644
--- a/include/block/scsi.h
+++ b/include/block/scsi.h
@@ -143,6 +143,8 @@
#define READ_CD 0xbe
#define SEND_DVD_STRUCTURE 0xbf
+const char *scsi_command_name(uint8_t cmd);
+
/*
* SERVICE ACTION IN subcodes
*/
--
1.8.4.rc4
- Re: [Qemu-devel] [PATCH 1/3] scsi-disk: close drive on START_STOP, (continued)
- Re: [Qemu-devel] [PATCH 1/3] scsi-disk: close drive on START_STOP, Paolo Bonzini, 2013/12/04
- Re: [Qemu-devel] [PATCH 1/3] scsi-disk: close drive on START_STOP, Markus Armbruster, 2013/12/04
- Re: [Qemu-devel] [PATCH 1/3] scsi-disk: close drive on START_STOP, Alexey Kardashevskiy, 2013/12/04
- Re: [Qemu-devel] [PATCH 1/3] scsi-disk: close drive on START_STOP, Markus Armbruster, 2013/12/04
- Re: [Qemu-devel] [PATCH 1/3] scsi-disk: close drive on START_STOP, Alexey Kardashevskiy, 2013/12/04
- Re: [Qemu-devel] [PATCH 1/3] scsi-disk: close drive on START_STOP, Markus Armbruster, 2013/12/05
- Re: [Qemu-devel] [PATCH 1/3] scsi-disk: close drive on START_STOP, Markus Armbruster, 2013/12/05
- Re: [Qemu-devel] [PATCH 1/3] scsi-disk: close drive on START_STOP, Alexey Kardashevskiy, 2013/12/05
- Re: [Qemu-devel] [PATCH 1/3] scsi-disk: close drive on START_STOP, Paolo Bonzini, 2013/12/05
- Re: [Qemu-devel] [PATCH 1/3] scsi-disk: close drive on START_STOP, Markus Armbruster, 2013/12/06
[Qemu-devel] [PATCH 3/3] scsi debug: print command name in debug,
Alexey Kardashevskiy <=
[Qemu-devel] [PATCH 2/3] scsi-disk: check for meduim on ALLOW_MEDIUM_REMOVAL, Alexey Kardashevskiy, 2013/12/03
Re: [Qemu-devel] [PATCH 2/3] scsi-disk: check for meduim on ALLOW_MEDIUM_REMOVAL, Paolo Bonzini, 2013/12/04