[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 14/27] vhost-user-scsi: assert() in iscsi_add_lun()
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH 14/27] vhost-user-scsi: assert() in iscsi_add_lun() |
Date: |
Wed, 23 Aug 2017 18:19:51 +0200 |
Instead of a preliminary check, add an assert to the function that has
the pre-condition.
Signed-off-by: Marc-André Lureau <address@hidden>
---
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-user-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 *iscsi_uri)
assert(lun);
assert(iscsi_uri);
+ assert(!lun->iscsi_ctx);
iscsi_ctx = 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);
- 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;
}
--
2.14.1.146.gd35faa819
- [Qemu-devel] [PATCH 07/27] vhost-user-scsi: use glib allocation, (continued)
- [Qemu-devel] [PATCH 07/27] vhost-user-scsi: use glib allocation, Marc-André Lureau, 2017/08/23
- [Qemu-devel] [PATCH 06/27] vhost-user-scsi: code style fixes, Marc-André Lureau, 2017/08/23
- [Qemu-devel] [PATCH 08/27] vhost-user-scsi: glib calls that allocate don't return NULL, Marc-André Lureau, 2017/08/23
- [Qemu-devel] [PATCH 09/27] vhost-user-scsi: also free the gtree, Marc-André Lureau, 2017/08/23
- [Qemu-devel] [PATCH 11/27] vhost-user-scsi: simplify unix path cleanup, Marc-André Lureau, 2017/08/23
- [Qemu-devel] [PATCH 10/27] vhost-user-scsi: remove vdev_scsi_find_by_vu(), Marc-André Lureau, 2017/08/23
- [Qemu-devel] [PATCH 12/27] vhost-user-scsi: use NULL pointer, Marc-André Lureau, 2017/08/23
- [Qemu-devel] [PATCH 13/27] vhost-user-scsi: use glib watch directly, Marc-André Lureau, 2017/08/23
- [Qemu-devel] [PATCH 14/27] vhost-user-scsi: assert() in iscsi_add_lun(),
Marc-André Lureau <=
- [Qemu-devel] [PATCH 15/27] vhost-user-scsi: remove vdev_scsi_add_iscsi_lun(), Marc-André Lureau, 2017/08/23
- [Qemu-devel] [PATCH 17/27] vhost-user-scsi: remove unimplemented functions, Marc-André Lureau, 2017/08/23
- [Qemu-devel] [PATCH 16/27] vhost-user-scsi: remove VUS_MAX_LUNS, Marc-André Lureau, 2017/08/23
- [Qemu-devel] [PATCH 18/27] vhost-user-scsi: rename VUS types, Marc-André Lureau, 2017/08/23
- [Qemu-devel] [PATCH 19/27] vhost-user-scsi: avoid use of iscsi_ namespace, Marc-André Lureau, 2017/08/23