[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 25/25] scsi: ignore LUN field in the CDB
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH v5 25/25] scsi: ignore LUN field in the CDB |
Date: |
Thu, 26 May 2011 12:56:51 +0200 |
The LUN field in the CDB is a historical relic. Ignore it as reserved,
which is what modern SCSI specifications actually say.
Signed-off-by: Paolo Bonzini <address@hidden>
Reviewed-by: Christoph Hellwig <address@hidden>
---
hw/scsi-disk.c | 6 +++---
hw/scsi-generic.c | 5 ++---
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c
index e0c384f..a8c7372 100644
--- a/hw/scsi-disk.c
+++ b/hw/scsi-disk.c
@@ -518,7 +518,7 @@ static int scsi_disk_emulate_inquiry(SCSIRequest *req,
uint8_t *outbuf)
memset(outbuf, 0, buflen);
- if (req->lun || req->cmd.buf[1] >> 5) {
+ if (req->lun) {
outbuf[0] = 0x7f; /* LUN not supported */
return buflen;
}
@@ -1024,9 +1024,9 @@ static int32_t scsi_send_command(SCSIRequest *req,
uint8_t *buf)
}
#endif
- if (req->lun || buf[1] >> 5) {
+ if (req->lun) {
/* Only LUN 0 supported. */
- DPRINTF("Unimplemented LUN %d\n", req->lun ? req->lun : buf[1] >> 5);
+ DPRINTF("Unimplemented LUN %d\n", req->lun);
if (command != REQUEST_SENSE && command != INQUIRY) {
scsi_command_complete(r, CHECK_CONDITION,
SENSE_CODE(LUN_NOT_SUPPORTED));
diff --git a/hw/scsi-generic.c b/hw/scsi-generic.c
index 7670606..8e59c7e 100644
--- a/hw/scsi-generic.c
+++ b/hw/scsi-generic.c
@@ -337,9 +337,8 @@ static int32_t scsi_send_command(SCSIRequest *req, uint8_t
*cmd)
SCSIGenericReq *r = DO_UPCAST(SCSIGenericReq, req, req);
int ret;
- if (cmd[0] != REQUEST_SENSE &&
- (req->lun != s->lun || (cmd[1] >> 5) != s->lun)) {
- DPRINTF("Unimplemented LUN %d\n", req->lun ? req->lun : cmd[1] >> 5);
+ if (cmd[0] != REQUEST_SENSE && req->lun != s->lun) {
+ DPRINTF("Unimplemented LUN %d\n", req->lun);
scsi_set_sense(s, SENSE_CODE(LUN_NOT_SUPPORTED));
r->req.status = CHECK_CONDITION;
scsi_req_complete(&r->req);
--
1.7.4.4
- [Qemu-devel] [PATCH v6 16/25] scsi: introduce scsi_req_continue, (continued)
- [Qemu-devel] [PATCH v5 17/25] scsi: introduce scsi_req_get_buf, Paolo Bonzini, 2011/05/26
- [Qemu-devel] [PATCH v5 08/25] scsi: Use 'SCSIRequest' directly, Paolo Bonzini, 2011/05/26
- [Qemu-devel] [PATCH v5 18/25] scsi: Implement 'get_sense' callback, Paolo Bonzini, 2011/05/26
- [Qemu-devel] [PATCH v5 15/25] scsi: introduce scsi_req_new, Paolo Bonzini, 2011/05/26
- [Qemu-devel] [PATCH v5 19/25] scsi-disk: add data direction checking, Paolo Bonzini, 2011/05/26
- [Qemu-devel] [PATCH v5 21/25] scsi-generic: Handle queue full, Paolo Bonzini, 2011/05/26
- [Qemu-devel] [PATCH v5 22/25] esp: rename sense to status, Paolo Bonzini, 2011/05/26
- [Qemu-devel] [PATCH v5 23/25] scsi: split command_complete callback in two, Paolo Bonzini, 2011/05/26
- [Qemu-devel] [PATCH v5 24/25] scsi: rename arguments to the new callbacks, Paolo Bonzini, 2011/05/26
- [Qemu-devel] [PATCH v5 25/25] scsi: ignore LUN field in the CDB,
Paolo Bonzini <=
- [Qemu-devel] [PATCH v5 05/25] scsi-generic: do not use a stale aiocb, Paolo Bonzini, 2011/05/26
- [Qemu-devel] [PATCH v5 20/25] scsi: make write_data return void, Paolo Bonzini, 2011/05/26
- Re: [Qemu-devel] [PULL v5 00/25] SCSI subsystem improvements, Anthony Liguori, 2011/05/31