From nobody Mon Apr 29 15:09:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1501259501640681.7839519804985; Fri, 28 Jul 2017 09:31:41 -0700 (PDT) Received: from localhost ([::1]:49125 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1db8As-0004KI-R0 for importer@patchew.org; Fri, 28 Jul 2017 12:31:38 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45937) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1db89z-0003ml-Vn for qemu-devel@nongnu.org; Fri, 28 Jul 2017 12:30:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1db89y-0005Pz-Su for qemu-devel@nongnu.org; Fri, 28 Jul 2017 12:30:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35498) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1db89u-0005Jf-3P; Fri, 28 Jul 2017 12:30:38 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1FC607ACDD; Fri, 28 Jul 2017 16:30:35 +0000 (UTC) Received: from localhost (ovpn-112-28.ams2.redhat.com [10.36.112.28]) by smtp.corp.redhat.com (Postfix) with ESMTP id B44CB6F921; Fri, 28 Jul 2017 16:30:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 1FC607ACDD Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=marcandre.lureau@redhat.com From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Fri, 28 Jul 2017 18:30:04 +0200 Message-Id: <20170728163004.21905-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Fri, 28 Jul 2017 16:30:35 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2] iscsi: use scsi_create_task() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , "open list:iSCSI" , Peter Lieven , Max Reitz , Ronnie Sahlberg , Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The function does the same initialization, and matches with scsi_free_scsi_task() usage, and qemu doesn't need to know the allocator details. Signed-off-by: Marc-Andr=C3=A9 Lureau --- block/iscsi.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) v2: - set cdb_size if API_VERSION < 20150510 diff --git a/block/iscsi.c b/block/iscsi.c index d557c99668..9449c90631 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -1013,6 +1013,7 @@ static BlockAIOCB *iscsi_aio_ioctl(BlockDriverState *= bs, struct iscsi_context *iscsi =3D iscsilun->iscsi; struct iscsi_data data; IscsiAIOCB *acb; + int xfer_dir; =20 acb =3D qemu_aio_get(&iscsi_aiocb_info, bs, cb, opaque); =20 @@ -1034,31 +1035,30 @@ static BlockAIOCB *iscsi_aio_ioctl(BlockDriverState= *bs, return NULL; } =20 - acb->task =3D malloc(sizeof(struct scsi_task)); - if (acb->task =3D=3D NULL) { - error_report("iSCSI: Failed to allocate task for scsi command. %s", - iscsi_get_error(iscsi)); - qemu_aio_unref(acb); - return NULL; - } - memset(acb->task, 0, sizeof(struct scsi_task)); - switch (acb->ioh->dxfer_direction) { case SG_DXFER_TO_DEV: - acb->task->xfer_dir =3D SCSI_XFER_WRITE; + xfer_dir =3D SCSI_XFER_WRITE; break; case SG_DXFER_FROM_DEV: - acb->task->xfer_dir =3D SCSI_XFER_READ; + xfer_dir =3D SCSI_XFER_READ; break; default: - acb->task->xfer_dir =3D SCSI_XFER_NONE; + xfer_dir =3D SCSI_XFER_NONE; break; } =20 - acb->task->cdb_size =3D acb->ioh->cmd_len; - memcpy(&acb->task->cdb[0], acb->ioh->cmdp, acb->ioh->cmd_len); - acb->task->expxferlen =3D acb->ioh->dxfer_len; + acb->task =3D scsi_create_task(acb->ioh->cmd_len, acb->ioh->cmdp, + xfer_dir, acb->ioh->dxfer_len); + if (acb->task =3D=3D NULL) { + error_report("iSCSI: Failed to allocate task for scsi command. %s", + iscsi_get_error(iscsi)); + qemu_aio_unref(acb); + return NULL; + } =20 +#if LIBISCSI_API_VERSION < 20150510 + acb->task->cdb_size =3D acb->ioh->cmd_len; /* fixed in libiscsi 1.13.0= */ +#endif data.size =3D 0; qemu_mutex_lock(&iscsilun->mutex); if (acb->task->xfer_dir =3D=3D SCSI_XFER_WRITE) { --=20 2.14.0.rc0.1.g40ca67566