From nobody Wed Feb 11 05:36:58 2026 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 1507656264080476.6815588868719; Tue, 10 Oct 2017 10:24:24 -0700 (PDT) Received: from localhost ([::1]:36227 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1yGP-0000u0-AT for importer@patchew.org; Tue, 10 Oct 2017 13:24:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45118) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1y4g-0007xB-HU for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:12:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e1y4f-0007Zo-F5 for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:12:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47584) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e1y4f-0007ZF-8b for qemu-devel@nongnu.org; Tue, 10 Oct 2017 13:12:09 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 601627E440; Tue, 10 Oct 2017 17:12:08 +0000 (UTC) Received: from localhost (ovpn-112-18.ams2.redhat.com [10.36.112.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6CFBA60630; Tue, 10 Oct 2017 17:12:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 601627E440 Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.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: Tue, 10 Oct 2017 19:11:11 +0200 Message-Id: <20171010171122.9756-17-marcandre.lureau@redhat.com> In-Reply-To: <20171010171122.9756-1-marcandre.lureau@redhat.com> References: <20171010171122.9756-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Tue, 10 Oct 2017 17:12:08 +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] [PULL 16/27] vhost-user-scsi: remove vdev_scsi_add_iscsi_lun() 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: pbonzini@redhat.com, felipe@nutanix.com, f4bug@amsat.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , changpeng.liu@intel.com 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" Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- contrib/vhost-user-scsi/vhost-user-scsi.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c b/contrib/vhost-user= -scsi/vhost-user-scsi.c index 0573ae794e..38fe451619 100644 --- a/contrib/vhost-user-scsi/vhost-user-scsi.c +++ b/contrib/vhost-user-scsi/vhost-user-scsi.c @@ -657,20 +657,6 @@ static vhost_scsi_dev_t *vdev_scsi_new(int server_sock) return vdev_scsi; } =20 -static int vdev_scsi_add_iscsi_lun(vhost_scsi_dev_t *vdev_scsi, - char *iscsi_uri, uint32_t lun) -{ - assert(vdev_scsi); - assert(iscsi_uri); - assert(lun < VUS_MAX_LUNS); - - if (iscsi_add_lun(&vdev_scsi->luns[lun], iscsi_uri) !=3D 0) { - return -1; - } - - return 0; -} - static int vdev_scsi_run(vhost_scsi_dev_t *vdev_scsi) { int cli_sock; @@ -734,7 +720,7 @@ int main(int argc, char **argv) } vdev_scsi =3D vdev_scsi_new(sock); =20 - if (vdev_scsi_add_iscsi_lun(vdev_scsi, iscsi_uri, 0) !=3D 0) { + if (iscsi_add_lun(&vdev_scsi->luns[0], iscsi_uri) !=3D 0) { goto err; } =20 --=20 2.15.0.rc0.40.gaefcc5f6f