[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 15/27] vhost-user-scsi: assert() in iscsi_add_lun(
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PULL v2 15/27] vhost-user-scsi: assert() in iscsi_add_lun() |
Date: |
Tue, 10 Oct 2017 23:34:54 +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>
Reviewed-by: Philippe Mathieu-Daudé <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 dd0de1fc89..0573ae794e 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;
}
--
2.15.0.rc0.40.gaefcc5f6f
- [Qemu-devel] [PULL v2 05/27] libvhost-user: improve vu_queue_pop() doc, (continued)
- [Qemu-devel] [PULL v2 05/27] libvhost-user: improve vu_queue_pop() doc, Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL v2 06/27] vhost-user-scsi: use g_strdup(), Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL v2 07/27] vhost-user-scsi: connect unix socket before allocating, Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL v2 08/27] vhost-user-scsi: code style fixes, Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL v2 09/27] vhost-user-scsi: use glib allocation, Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL v2 10/27] vhost-user-scsi: glib calls that allocate don't return NULL, Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL v2 11/27] vhost-user-scsi: also free the gtree, Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL v2 12/27] vhost-user-scsi: remove vdev_scsi_find_by_vu(), Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL v2 13/27] vhost-user-scsi: simplify unix path cleanup, Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL v2 14/27] vhost-user-scsi: use NULL pointer, Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL v2 15/27] vhost-user-scsi: assert() in iscsi_add_lun(),
Marc-André Lureau <=
- [Qemu-devel] [PULL v2 16/27] vhost-user-scsi: remove vdev_scsi_add_iscsi_lun(), Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL v2 17/27] vhost-user-scsi: remove VUS_MAX_LUNS, Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL v2 18/27] vhost-user-scsi: remove unimplemented functions, Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL v2 19/27] vhost-user-scsi: rename VUS types, Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL v2 20/27] vhost-user-scsi: avoid use of iscsi_ namespace, Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL v2 21/27] vhost-user-scsi: don't copy iscsi/scsi-lowlevel.h, Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL v2 22/27] vhost-user-scsi: drop extra callback pointer, Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL v2 23/27] vhost-user-scsi: simplify source handling, Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL v2 24/27] vhost-user-scsi: use glib logging, Marc-André Lureau, 2017/10/10
- [Qemu-devel] [PULL v2 25/27] libvhost-user: add glib source helper, Marc-André Lureau, 2017/10/10