david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vhost-user-scsi: remove vdev_scsi_add_iscsi_lun()

Browse Source 
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
This commit is contained in:
Marc-André Lureau 2017-08-16 21:23:07 +02:00
parent fa2cd143bf
commit a755d271d8
1 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
contrib/vhost-user-scsi/vhost-user-scsi.c
View File

@ -657,20 +657,6 @@ static vhost_scsi_dev_t *vdev_scsi_new(int server_sock)
return vdev_scsi; 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) static int vdev_scsi_run(vhost_scsi_dev_t *vdev_scsi)
{ {
int cli_sock; int cli_sock;
@ -734,7 +720,7 @@ int main(int argc, char **argv)
} }
vdev_scsi = vdev_scsi_new(sock); 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; goto err;
} }