Am 27.06.2013 um 15:11 hat Peter Lieven geschrieben:
> Signed-off-by: Peter Lieven <p...@kamp.de>
> Reviewed-by: Paolo Bonzini <pbonz...@redhat.com>
> ---
> block/iscsi.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 47 insertions(+)
>
> diff --git a/block/iscsi.c b/block/iscsi.c
> index 0bbf0b1..a38a1bf 100644
> --- a/block/iscsi.c
> +++ b/block/iscsi.c
> @@ -49,6 +49,11 @@ typedef struct IscsiLun {
> uint64_t num_blocks;
> int events;
> QEMUTimer *nop_timer;
> + uint8_t lbpme;
> + uint8_t lbprz;
> + uint8_t lbpu;
> + uint8_t lbpws;
> + uint8_t lbpws10;
> } IscsiLun;
>
> typedef struct IscsiAIOCB {
> @@ -948,6 +953,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;
> @@ -1130,6 +1137,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;
> + int full_size;
> +
> + task = iscsi_inquiry_sync(iscsi, iscsilun->lun, 1,
> +
> SCSI_INQUIRY_PAGECODE_LOGICAL_BLOCK_PROVISIONING,
> + 64);
> + if (task == NULL || task->status != SCSI_STATUS_GOOD) {
> + error_report("iSCSI: Inquiry command failed : %s",
> + iscsi_get_error(iscsilun->iscsi));
The indentation is off here.
> + ret = -EINVAL;
> + goto out;
> + }
> + 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, iscsilun->lun, 1,
> +
> SCSI_INQUIRY_PAGECODE_LOGICAL_BLOCK_PROVISIONING,
> + full_size);
> + if (task == NULL || task->status != SCSI_STATUS_GOOD) {
> + error_report("iSCSI: Inquiry command failed : %s",
> + iscsi_get_error(iscsilun->iscsi));
> + 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;
> + }
> + iscsilun->lbpu = inq_lbp->lbpu;
> + iscsilun->lbpws = inq_lbp->lbpws;
> + iscsilun->lbpws10 = inq_lbp->lbpws10;
> + }
As mentioned in Stefan's mail, scsi_free_scsi_task() should be added in
this patch rather than patch 2.
Kevin
