From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43600) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dkYOm-0005hp-MW for qemu-devel@nongnu.org; Wed, 23 Aug 2017 12:20:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dkYOj-0007Aq-IW for qemu-devel@nongnu.org; Wed, 23 Aug 2017 12:20:56 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44940) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dkYOj-0007Ab-BS for qemu-devel@nongnu.org; Wed, 23 Aug 2017 12:20:53 -0400 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Wed, 23 Aug 2017 18:19:51 +0200 Message-Id: <20170823162004.27337-15-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 14/27] vhost-user-scsi: assert() in iscsi_add_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?= Instead of a preliminary check, add an assert to the function that has the pre-condition. Signed-off-by: Marc-Andr=C3=A9 Lureau --- contrib/vhost-user-scsi/vhost-user-scsi.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c b/contrib/vhost-us= er-scsi/vhost-user-scsi.c index b40009e234..988417393f 100644 --- a/contrib/vhost-user-scsi/vhost-user-scsi.c +++ b/contrib/vhost-user-scsi/vhost-user-scsi.c @@ -255,6 +255,7 @@ static int iscsi_add_lun(iscsi_lun_t *lun, char *iscs= i_uri) =20 assert(lun); assert(iscsi_uri); + assert(!lun->iscsi_ctx); =20 iscsi_ctx =3D iscsi_create_context(VUS_ISCSI_INITIATOR); if (!iscsi_ctx) { @@ -664,11 +665,6 @@ static int vdev_scsi_add_iscsi_lun(vhost_scsi_dev_t = *vdev_scsi, assert(iscsi_uri); assert(lun < VUS_MAX_LUNS); =20 - if (vdev_scsi->luns[lun].iscsi_ctx) { - PERR("Lun %d already configured", lun); - return -1; - } - if (iscsi_add_lun(&vdev_scsi->luns[lun], iscsi_uri) !=3D 0) { return -1; } --=20 2.14.1.146.gd35faa819