On 03/02/2018 07:16, Stefan Hajnoczi wrote:
> The IscsiAIOCB->buf field has not been used since commit
> e49ab19fcaa617ad6cdfe1ac401327326b6a2552 ("block/iscsi: bump libiscsi
> requirement to 1.9.0"). It used to be a linear buffer for old libiscsi
> versions that didn't support scatter-gather. The minimum libiscsi
> version supports scatter-gather so we don't linearize buffers anymore.
>
> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
> ---
> block/iscsi.c | 8 --------
> 1 file changed, 8 deletions(-)
>
> diff --git a/block/iscsi.c b/block/iscsi.c
> index 6a1c53711a..cd0738942c 100644
> --- a/block/iscsi.c
> +++ b/block/iscsi.c
> @@ -112,7 +112,6 @@ typedef struct IscsiAIOCB {
> QEMUBH *bh;
> IscsiLun *iscsilun;
> struct scsi_task *task;
> - uint8_t *buf;
> int status;
> int64_t sector_num;
> int nb_sectors;
> @@ -145,9 +144,6 @@ iscsi_bh_cb(void *p)
>
> qemu_bh_delete(acb->bh);
>
> - g_free(acb->buf);
> - acb->buf = NULL;
> -
> acb->common.cb(acb->common.opaque, acb->status);
>
> if (acb->task != NULL) {
> @@ -925,9 +921,6 @@ iscsi_aio_ioctl_cb(struct iscsi_context *iscsi, int status,
> {
> IscsiAIOCB *acb = opaque;
>
> - g_free(acb->buf);
> - acb->buf = NULL;
> -
> acb->status = 0;
> if (status < 0) {
> error_report("Failed to ioctl(SG_IO) to iSCSI lun. %s",
> @@ -1002,7 +995,6 @@ static BlockAIOCB *iscsi_aio_ioctl(BlockDriverState *bs,
> acb->iscsilun = iscsilun;
> acb->bh = NULL;
> acb->status = -EINPROGRESS;
> - acb->buf = NULL;
> acb->ioh = buf;
>
> if (req != SG_IO) {
>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>