From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43633) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dkYOp-0005mH-Dz for qemu-devel@nongnu.org; Wed, 23 Aug 2017 12:21:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dkYOo-0007CS-Hc for qemu-devel@nongnu.org; Wed, 23 Aug 2017 12:20:59 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59304) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dkYOo-0007CA-28 for qemu-devel@nongnu.org; Wed, 23 Aug 2017 12:20:58 -0400 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Wed, 23 Aug 2017 18:19:52 +0200 Message-Id: <20170823162004.27337-16-marcandre.lureau@redhat.com> In-Reply-To: <20170823162004.27337-1-marcandre.lureau@redhat.com> References: <20170823162004.27337-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 15/27] vhost-user-scsi: remove vdev_scsi_add_iscsi_lun() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: changpeng.liu@intel.com, felipe@nutanix.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Signed-off-by: Marc-Andr=C3=A9 Lureau --- 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-us= er-scsi/vhost-user-scsi.c index 988417393f..f6f9e7b192 100644 --- a/contrib/vhost-user-scsi/vhost-user-scsi.c +++ b/contrib/vhost-user-scsi/vhost-user-scsi.c @@ -658,20 +658,6 @@ static vhost_scsi_dev_t *vdev_scsi_new(int server_so= ck) 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) { GIOChannel *chan; @@ -736,7 +722,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.14.1.146.gd35faa819