[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 15/27] vhost-user-scsi: remove vdev_scsi_add_iscsi_l
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH 15/27] vhost-user-scsi: remove vdev_scsi_add_iscsi_lun() |
Date: |
Wed, 23 Aug 2017 18:19:52 +0200 |
Signed-off-by: Marc-André Lureau <address@hidden>
---
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-user-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_sock)
return vdev_scsi;
}
-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) != 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 = vdev_scsi_new(sock);
- if (vdev_scsi_add_iscsi_lun(vdev_scsi, iscsi_uri, 0) != 0) {
+ if (iscsi_add_lun(&vdev_scsi->luns[0], iscsi_uri) != 0) {
goto err;
}
--
2.14.1.146.gd35faa819
- [Qemu-devel] [PATCH 06/27] vhost-user-scsi: code style fixes, (continued)
- [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, 2017/08/23
- [Qemu-devel] [PATCH 15/27] vhost-user-scsi: remove vdev_scsi_add_iscsi_lun(),
Marc-André Lureau <=
- [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
- [Qemu-devel] [PATCH 20/27] vhost-user-scsi: don't copy iscsi/scsi-lowlevel.h, Marc-André Lureau, 2017/08/23
- [Qemu-devel] [PATCH 21/27] vhost-user-scsi: drop extra callback pointer, Marc-André Lureau, 2017/08/23