[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 16/35] scsi: implement REPORT LUNS for arbitrary LUN
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 16/35] scsi: implement REPORT LUNS for arbitrary LUNs |
Date: |
Thu, 13 Oct 2011 13:03:46 +0200 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/scsi-bus.c | 49 +++++++++++++++++++++++++++++++++++++++----------
1 files changed, 39 insertions(+), 10 deletions(-)
diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c
index 7104e98..a2d57a7 100644
--- a/hw/scsi-bus.c
+++ b/hw/scsi-bus.c
@@ -170,7 +170,7 @@ typedef struct SCSITargetReq SCSITargetReq;
struct SCSITargetReq {
SCSIRequest req;
int len;
- uint8_t buf[64];
+ uint8_t buf[2056];
};
static void store_lun(uint8_t *outbuf, int lun)
@@ -185,23 +185,52 @@ static void store_lun(uint8_t *outbuf, int lun)
static bool scsi_target_emulate_report_luns(SCSITargetReq *r)
{
- int len;
+ DeviceState *qdev;
+ int i, len, n;
+ int id;
+ bool found_lun0;
+
if (r->req.cmd.xfer < 16) {
return false;
}
if (r->req.cmd.buf[2] > 2) {
return false;
}
- len = MIN(sizeof r->buf, r->req.cmd.xfer);
+ id = r->req.dev->id;
+ found_lun0 = false;
+ n = 0;
+ QTAILQ_FOREACH(qdev, &r->req.bus->qbus.children, sibling) {
+ SCSIDevice *dev = DO_UPCAST(SCSIDevice, qdev, qdev);
+
+ if (dev->id == id) {
+ if (dev->lun == 0) {
+ found_lun0 = true;
+ }
+ n += 8;
+ }
+ }
+ if (!found_lun0) {
+ n += 8;
+ }
+ len = MIN(n + 8, r->req.cmd.xfer & ~7);
+ if (len > sizeof(r->buf)) {
+ /* TODO: > 256 LUNs? */
+ return false;
+ }
+
memset(r->buf, 0, len);
- if (r->req.dev->lun != 0) {
- r->buf[3] = 16;
- r->len = 24;
- store_lun(&r->buf[16], r->req.dev->lun);
- } else {
- r->buf[3] = 8;
- r->len = 16;
+ stl_be_p(&r->buf, n);
+ i = found_lun0 ? 8 : 16;
+ QTAILQ_FOREACH(qdev, &r->req.bus->qbus.children, sibling) {
+ SCSIDevice *dev = DO_UPCAST(SCSIDevice, qdev, qdev);
+
+ if (dev->id == id) {
+ store_lun(&r->buf[i], dev->lun);
+ i += 8;
+ }
}
+ assert(i == n + 8);
+ r->len = len;
return true;
}
--
1.7.6
- [Qemu-devel] [PATCH 14/35] qdev: switch children device list to QTAILQ, (continued)
[Qemu-devel] [PATCH 16/35] scsi: implement REPORT LUNS for arbitrary LUNs,
Paolo Bonzini <=
[Qemu-devel] [PATCH 18/35] scsi: add channel to addressing, Paolo Bonzini, 2011/10/13
[Qemu-devel] [PATCH 17/35] scsi: allow arbitrary LUNs, Paolo Bonzini, 2011/10/13
[Qemu-devel] [PATCH 22/35] scsi-disk: fix retrying a flush, Paolo Bonzini, 2011/10/13
[Qemu-devel] [PATCH 01/35] scsi: pass correct sense code for ENOMEDIUM, Paolo Bonzini, 2011/10/13
[Qemu-devel] [PATCH 25/35] scsi-generic: check ioctl statuses when SG_IO succeeds, Paolo Bonzini, 2011/10/13
[Qemu-devel] [PATCH 24/35] scsi-generic: remove scsi_req_fixup, Paolo Bonzini, 2011/10/13
[Qemu-devel] [PATCH 23/35] scsi-generic: drop SCSIGenericState, Paolo Bonzini, 2011/10/13
[Qemu-devel] [PATCH 26/35] scsi-generic: look at host status, Paolo Bonzini, 2011/10/13
[Qemu-devel] [PATCH 33/35] scsi: export scsi_generic_reqops, Paolo Bonzini, 2011/10/13
[Qemu-devel] [PATCH 32/35] scsi: make reqops static const, Paolo Bonzini, 2011/10/13