Message ID | 1374135551-22401-2-git-send-email-pl@kamp.de |
---|---|
State | New |
Headers | show |
Il 18/07/2013 10:19, Peter Lieven ha scritto: > Signed-off-by: Peter Lieven <pl@kamp.de> > --- > block/iscsi.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 77 insertions(+) > > diff --git a/block/iscsi.c b/block/iscsi.c > index 0bbf0b1..ab42f1e 100644 > --- a/block/iscsi.c > +++ b/block/iscsi.c > @@ -49,6 +49,10 @@ typedef struct IscsiLun { > uint64_t num_blocks; > int events; > QEMUTimer *nop_timer; > + uint8_t lbpme; > + uint8_t lbprz; > + struct scsi_inquiry_logical_block_provisioning lbp; > + struct scsi_inquiry_block_limits bl; Available since 1.3.0, looks good. Acked-by: Paolo Bonzini <pbonzini@redhat.com> > } IscsiLun; > > typedef struct IscsiAIOCB { > @@ -948,6 +952,8 @@ static int iscsi_readcapacity_sync(IscsiLun *iscsilun) > } else { > iscsilun->block_size = rc16->block_length; > iscsilun->num_blocks = rc16->returned_lba + 1; > + iscsilun->lbpme = rc16->lbpme; > + iscsilun->lbprz = rc16->lbprz; > } > } > break; > @@ -1000,6 +1006,37 @@ static QemuOptsList runtime_opts = { > }, > }; > > +static struct scsi_task *iscsi_do_inquiry(struct iscsi_context *iscsi, > + int lun, int evpd, int pc) { > + int full_size; > + struct scsi_task *task = NULL; > + task = iscsi_inquiry_sync(iscsi, lun, evpd, pc, 64); > + if (task == NULL || task->status != SCSI_STATUS_GOOD) { > + goto fail; > + } > + full_size = scsi_datain_getfullsize(task); > + if (full_size > task->datain.size) { > + scsi_free_scsi_task(task); > + > + /* we need more data for the full list */ > + task = iscsi_inquiry_sync(iscsi, lun, evpd, pc, full_size); > + if (task == NULL || task->status != SCSI_STATUS_GOOD) { > + goto fail; > + } > + } > + > + return task; > + > +fail: > + error_report("iSCSI: Inquiry command failed : %s", > + iscsi_get_error(iscsi)); > + if (task) { > + scsi_free_scsi_task(task); > + return NULL; > + } > + return NULL; > +} > + > /* > * We support iscsi url's on the form > * iscsi://[<username>%<password>@]<host>[:<port>]/<targetname>/<lun> > @@ -1130,6 +1167,46 @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags) > bs->sg = 1; > } > > + if (iscsilun->lbpme) { > + struct scsi_inquiry_logical_block_provisioning *inq_lbp; > + task = iscsi_do_inquiry(iscsilun->iscsi, iscsilun->lun, 1, > + SCSI_INQUIRY_PAGECODE_LOGICAL_BLOCK_PROVISIONING); > + if (task == NULL) { > + ret = -EINVAL; > + goto out; > + } > + inq_lbp = scsi_datain_unmarshall(task); > + if (inq_lbp == NULL) { > + error_report("iSCSI: failed to unmarshall inquiry datain blob"); > + ret = -EINVAL; > + goto out; > + } > + memcpy(&iscsilun->lbp, inq_lbp, > + sizeof(struct scsi_inquiry_logical_block_provisioning)); > + scsi_free_scsi_task(task); > + task = NULL; > + } > + > + if (iscsilun->lbp.lbpu) { > + struct scsi_inquiry_block_limits *inq_bl; > + task = iscsi_do_inquiry(iscsilun->iscsi, iscsilun->lun, 1, > + SCSI_INQUIRY_PAGECODE_BLOCK_LIMITS); > + if (task == NULL) { > + ret = -EINVAL; > + goto out; > + } > + inq_bl = scsi_datain_unmarshall(task); > + if (inq_bl == NULL) { > + error_report("iSCSI: failed to unmarshall inquiry datain blob"); > + ret = -EINVAL; > + goto out; > + } > + memcpy(&iscsilun->bl, inq_bl, > + sizeof(struct scsi_inquiry_block_limits)); > + scsi_free_scsi_task(task); > + task = NULL; > + } > + > #if defined(LIBISCSI_FEATURE_NOP_COUNTER) > /* Set up a timer for sending out iSCSI NOPs */ > iscsilun->nop_timer = qemu_new_timer_ms(rt_clock, iscsi_nop_timed_event, iscsilun); >
diff --git a/block/iscsi.c b/block/iscsi.c index 0bbf0b1..ab42f1e 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -49,6 +49,10 @@ typedef struct IscsiLun { uint64_t num_blocks; int events; QEMUTimer *nop_timer; + uint8_t lbpme; + uint8_t lbprz; + struct scsi_inquiry_logical_block_provisioning lbp; + struct scsi_inquiry_block_limits bl; } IscsiLun; typedef struct IscsiAIOCB { @@ -948,6 +952,8 @@ static int iscsi_readcapacity_sync(IscsiLun *iscsilun) } else { iscsilun->block_size = rc16->block_length; iscsilun->num_blocks = rc16->returned_lba + 1; + iscsilun->lbpme = rc16->lbpme; + iscsilun->lbprz = rc16->lbprz; } } break; @@ -1000,6 +1006,37 @@ static QemuOptsList runtime_opts = { }, }; +static struct scsi_task *iscsi_do_inquiry(struct iscsi_context *iscsi, + int lun, int evpd, int pc) { + int full_size; + struct scsi_task *task = NULL; + task = iscsi_inquiry_sync(iscsi, lun, evpd, pc, 64); + if (task == NULL || task->status != SCSI_STATUS_GOOD) { + goto fail; + } + full_size = scsi_datain_getfullsize(task); + if (full_size > task->datain.size) { + scsi_free_scsi_task(task); + + /* we need more data for the full list */ + task = iscsi_inquiry_sync(iscsi, lun, evpd, pc, full_size); + if (task == NULL || task->status != SCSI_STATUS_GOOD) { + goto fail; + } + } + + return task; + +fail: + error_report("iSCSI: Inquiry command failed : %s", + iscsi_get_error(iscsi)); + if (task) { + scsi_free_scsi_task(task); + return NULL; + } + return NULL; +} + /* * We support iscsi url's on the form * iscsi://[<username>%<password>@]<host>[:<port>]/<targetname>/<lun> @@ -1130,6 +1167,46 @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags) bs->sg = 1; } + if (iscsilun->lbpme) { + struct scsi_inquiry_logical_block_provisioning *inq_lbp; + task = iscsi_do_inquiry(iscsilun->iscsi, iscsilun->lun, 1, + SCSI_INQUIRY_PAGECODE_LOGICAL_BLOCK_PROVISIONING); + if (task == NULL) { + ret = -EINVAL; + goto out; + } + inq_lbp = scsi_datain_unmarshall(task); + if (inq_lbp == NULL) { + error_report("iSCSI: failed to unmarshall inquiry datain blob"); + ret = -EINVAL; + goto out; + } + memcpy(&iscsilun->lbp, inq_lbp, + sizeof(struct scsi_inquiry_logical_block_provisioning)); + scsi_free_scsi_task(task); + task = NULL; + } + + if (iscsilun->lbp.lbpu) { + struct scsi_inquiry_block_limits *inq_bl; + task = iscsi_do_inquiry(iscsilun->iscsi, iscsilun->lun, 1, + SCSI_INQUIRY_PAGECODE_BLOCK_LIMITS); + if (task == NULL) { + ret = -EINVAL; + goto out; + } + inq_bl = scsi_datain_unmarshall(task); + if (inq_bl == NULL) { + error_report("iSCSI: failed to unmarshall inquiry datain blob"); + ret = -EINVAL; + goto out; + } + memcpy(&iscsilun->bl, inq_bl, + sizeof(struct scsi_inquiry_block_limits)); + scsi_free_scsi_task(task); + task = NULL; + } + #if defined(LIBISCSI_FEATURE_NOP_COUNTER) /* Set up a timer for sending out iSCSI NOPs */ iscsilun->nop_timer = qemu_new_timer_ms(rt_clock, iscsi_nop_timed_event, iscsilun);
Signed-off-by: Peter Lieven <pl@kamp.de> --- block/iscsi.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+)