[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 28/30] scsi-disk: restruct emulation: REPORT_LUNS
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 28/30] scsi-disk: restruct emulation: REPORT_LUNS |
Date: |
Thu, 26 Nov 2009 15:34:14 +0100 |
Move REPORT_LUNS emulation from scsi_send_command() to
scsi_disk_emulate_command().
Also add REPORT_LUNS to scsi-defs.h and scsi_command_name().
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/scsi-bus.c | 1 +
hw/scsi-defs.h | 1 +
hw/scsi-disk.c | 16 ++++++++--------
3 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c
index deb6b4f..b6de5c6 100644
--- a/hw/scsi-bus.c
+++ b/hw/scsi-bus.c
@@ -442,6 +442,7 @@ static const char *scsi_command_name(uint8_t cmd)
[ REPORT_DENSITY_SUPPORT ] = "REPORT_DENSITY_SUPPORT",
[ GET_CONFIGURATION ] = "GET_CONFIGURATION",
[ SERVICE_ACTION_IN ] = "SERVICE_ACTION_IN",
+ [ REPORT_LUNS ] = "REPORT_LUNS",
[ LOAD_UNLOAD ] = "LOAD_UNLOAD",
[ SET_CD_SPEED ] = "SET_CD_SPEED",
[ BLANK ] = "BLANK",
diff --git a/hw/scsi-defs.h b/hw/scsi-defs.h
index 4aeb667..cc7f35e 100644
--- a/hw/scsi-defs.h
+++ b/hw/scsi-defs.h
@@ -101,6 +101,7 @@
#define REPORT_DENSITY_SUPPORT 0x44
#define GET_CONFIGURATION 0x46
#define SERVICE_ACTION_IN 0x9e
+#define REPORT_LUNS 0xa0
#define LOAD_UNLOAD 0xa6
#define SET_CD_SPEED 0xbb
#define BLANK 0xa1
diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c
index b481c13..1507bcd 100644
--- a/hw/scsi-disk.c
+++ b/hw/scsi-disk.c
@@ -787,6 +787,13 @@ static int scsi_disk_emulate_command(SCSIRequest *req,
uint8_t *outbuf)
}
DPRINTF("Unsupported Service Action In\n");
goto illegal_request;
+ case REPORT_LUNS:
+ if (req->cmd.xfer < 16)
+ goto illegal_request;
+ memset(outbuf, 0, 16);
+ outbuf[3] = 8;
+ buflen = 16;
+ break;
default:
goto illegal_request;
}
@@ -904,6 +911,7 @@ static int32_t scsi_send_command(SCSIDevice *d, uint32_t
tag,
case READ_TOC:
case GET_CONFIGURATION:
case SERVICE_ACTION_IN:
+ case REPORT_LUNS:
rc = scsi_disk_emulate_command(&r->req, outbuf);
if (rc > 0) {
r->iov.iov_len = rc;
@@ -932,14 +940,6 @@ static int32_t scsi_send_command(SCSIDevice *d, uint32_t
tag,
r->sector_count = len * s->cluster_size;
is_write = 1;
break;
- case 0xa0:
- DPRINTF("Report LUNs (len %d)\n", len);
- if (len < 16)
- goto fail;
- memset(outbuf, 0, 16);
- outbuf[3] = 8;
- r->iov.iov_len = 16;
- break;
case VERIFY:
DPRINTF("Verify (sector %" PRId64 ", count %d)\n", lba, len);
break;
--
1.6.2.5
- [Qemu-devel] [PATCH 07/30] scsi: add scsi-defs.h, (continued)
- [Qemu-devel] [PATCH 07/30] scsi: add scsi-defs.h, Gerd Hoffmann, 2009/11/26
- [Qemu-devel] [PATCH 15/30] scsi: add scsi_req_print(), Gerd Hoffmann, 2009/11/26
- [Qemu-devel] [PATCH 19/30] scsi-disk: restruct emulation: RESERVE+RELEASE, Gerd Hoffmann, 2009/11/26
- [Qemu-devel] [PATCH 27/30] scsi-disk: restruct emulation: SERVICE_ACTION_IN, Gerd Hoffmann, 2009/11/26
- [Qemu-devel] [PATCH 18/30] scsi-disk: restruct emulation: INQUIRY, Gerd Hoffmann, 2009/11/26
- [Qemu-devel] [PATCH 21/30] scsi-disk: restruct emulation: START_STOP, Gerd Hoffmann, 2009/11/26
- [Qemu-devel] [PATCH 26/30] scsi-disk: restruct emulation: GET_CONFIGURATION, Gerd Hoffmann, 2009/11/26
- [Qemu-devel] [PATCH 30/30] scsi: add read/write 16 commands., Gerd Hoffmann, 2009/11/26
- [Qemu-devel] [PATCH 16/30] scsi-disk: restruct emulation: core + TEST_UNIT_READY., Gerd Hoffmann, 2009/11/26
- [Qemu-devel] [PATCH 22/30] scsi-disk: restruct emulation: ALLOW_MEDIUM_REMOVAL, Gerd Hoffmann, 2009/11/26
- [Qemu-devel] [PATCH 28/30] scsi-disk: restruct emulation: REPORT_LUNS,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 23/30] scsi-disk: restruct emulation: READ_CAPACITY, Gerd Hoffmann, 2009/11/26
- [Qemu-devel] [PATCH 25/30] scsi-disk: restruct emulation: READ_TOC, Gerd Hoffmann, 2009/11/26
- [Qemu-devel] [PATCH 20/30] scsi-disk: restruct emulation: MODE_SENSE, Gerd Hoffmann, 2009/11/26
- [Qemu-devel] [PATCH 29/30] scsi-disk: restruct emulation: VERIFY, Gerd Hoffmann, 2009/11/26
- [Qemu-devel] [PATCH 24/30] scsi-disk: restruct emulation: SYNCHRONIZE_CACHE, Gerd Hoffmann, 2009/11/26