ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vhost: introduced spdk_vhost_dev_unregister()

Browse Source 
Separated new function spdk_vhost_dev_unregister() out of
spdk_vhost_scsi_dev_remove().

Change-Id: Ic604f10233ca3f7998774595c10d6c120dd43e2e
Signed-off-by: Dariusz Stojaczyk <dariuszx.stojaczyk@intel.com>
Reviewed-on: https://review.gerrithub.io/361948
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
This commit is contained in:
Dariusz Stojaczyk 2017-05-22 15:34:45 +02:00 committed by Jim Harris
parent 2f1cfc7be0
commit aa72cafd8b
1 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lib/vhost/vhost.c
View File

@ -1027,15 +1027,12 @@ spdk_vhost_scsi_dev_construct(const char *name, uint64_t cpumask)
return rc; return rc;
} }
int static int
spdk_vhost_scsi_dev_remove(struct spdk_vhost_scsi_dev *svdev) spdk_vhost_dev_unregister(struct spdk_vhost_dev *vdev)
{ {
struct spdk_vhost_dev *vdev;
unsigned ctrlr_num; unsigned ctrlr_num;
char path[PATH_MAX]; char path[PATH_MAX];
int i;
vdev = &svdev->vdev;
if (vdev->lcore != -1) { if (vdev->lcore != -1) {
SPDK_ERRLOG("Controller %s is in use and hotplug is not supported\n", vdev->name); SPDK_ERRLOG("Controller %s is in use and hotplug is not supported\n", vdev->name);
return -ENODEV; return -ENODEV;
@ -1058,6 +1055,25 @@ spdk_vhost_scsi_dev_remove(struct spdk_vhost_scsi_dev *svdev)
return -EINVAL; return -EINVAL;
} }
if (rte_vhost_driver_unregister(path) != 0) {
SPDK_ERRLOG("Could not unregister controller %s with vhost library\n"
"Check if domain socket %s still exists\n", vdev->name, path);
return -EIO;
}
SPDK_NOTICELOG("Controller %s: removed\n", vdev->name);
g_spdk_vhost_devices[ctrlr_num] = NULL;
return 0;
}
int
spdk_vhost_scsi_dev_remove(struct spdk_vhost_scsi_dev *svdev)
{
struct spdk_vhost_dev *vdev;
int i;
vdev = &svdev->vdev;
for (i = 0; i < SPDK_VHOST_SCSI_CTRLR_MAX_DEVS; ++i) { for (i = 0; i < SPDK_VHOST_SCSI_CTRLR_MAX_DEVS; ++i) {
if (svdev->scsi_dev[i]) { if (svdev->scsi_dev[i]) {
SPDK_ERRLOG("Trying to remove non-empty controller: %s.\n", vdev->name); SPDK_ERRLOG("Trying to remove non-empty controller: %s.\n", vdev->name);
@ -1065,9 +1081,8 @@ spdk_vhost_scsi_dev_remove(struct spdk_vhost_scsi_dev *svdev)
} }
} }
if (rte_vhost_driver_unregister(path) != 0) { if (spdk_vhost_dev_unregister(vdev) != 0) {
SPDK_ERRLOG("Could not unregister controller %s with vhost library\n" SPDK_ERRLOG("Could not unregister scsi controller %s with vhost library\n", vdev->name);
"Check if domain socket %s still exists\n", vdev->name, path);
return -EIO; return -EIO;
} }
@ -1079,7 +1094,6 @@ spdk_vhost_scsi_dev_remove(struct spdk_vhost_scsi_dev *svdev)
*/ */
free(vdev->name); free(vdev->name);
spdk_free(svdev); spdk_free(svdev);
g_spdk_vhost_devices[ctrlr_num] = NULL;
return 0; return 0;
} }