summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@redhat.com>2017-08-16 21:23:07 +0200
committerMarc-André Lureau <marcandre.lureau@redhat.com>2017-10-10 23:31:09 +0200
commita755d271d8cb419afb1f237cc034d3a97af3a304 (patch)
tree141eea87cab313dc81c383d9b9f41ec68480631b /contrib
parentfa2cd143bf381b06f86cce62f16dfa97f387c20d (diff)
downloadqemu-a755d271d8cb419afb1f237cc034d3a97af3a304.tar.gz
vhost-user-scsi: remove vdev_scsi_add_iscsi_lun()
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Diffstat (limited to 'contrib')
-rw-r--r--contrib/vhost-user-scsi/vhost-user-scsi.c16
1 files changed, 1 insertions, 15 deletions
diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c b/contrib/vhost-user-scsi/vhost-user-scsi.c
index 0573ae794e..38fe451619 100644
--- a/contrib/vhost-user-scsi/vhost-user-scsi.c
+++ b/contrib/vhost-user-scsi/vhost-user-scsi.c
@@ -657,20 +657,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)
{
int cli_sock;
@@ -734,7 +720,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;
}