From: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Wed, 16 Aug 2017 19:21:38 +0000 (+0200)
Subject: vhost-user-scsi: assert() in iscsi_add_lun()
X-Git-Tag: v2.11.0-rc0~58^2~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fa2cd143bf381b06f86cce62f16dfa97f387c20d;p=thirdparty%2Fqemu.git

vhost-user-scsi: assert() in iscsi_add_lun()

Instead of a preliminary check, add an assert to the function that has
the pre-condition.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---

diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c b/contrib/vhost-user-scsi/vhost-user-scsi.c
index dd0de1fc890..0573ae794e9 100644
--- a/contrib/vhost-user-scsi/vhost-user-scsi.c
+++ b/contrib/vhost-user-scsi/vhost-user-scsi.c
@@ -257,6 +257,7 @@ static int iscsi_add_lun(iscsi_lun_t *lun, char *iscsi_uri)
 
     assert(lun);
     assert(iscsi_uri);
+    assert(!lun->iscsi_ctx);
 
     iscsi_ctx = iscsi_create_context(VUS_ISCSI_INITIATOR);
     if (!iscsi_ctx) {
@@ -663,11 +664,6 @@ static int vdev_scsi_add_iscsi_lun(vhost_scsi_dev_t *vdev_scsi,
     assert(iscsi_uri);
     assert(lun < VUS_MAX_LUNS);
 
-    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) != 0) {
         return -1;
     }