d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

vhost/scsi: remove the support of "Dev" for configuration file

Browse Source 
"Dev" was deprecated since v18.01, now we have released v18.04,
so remove the "Dev" support from existing code.

Change-Id: I54c4cf83f78d3b0fdb13e625936c889d7bfaeba9
Signed-off-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-on: https://review.gerrithub.io/409989
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Dariusz Stojaczyk <dariuszx.stojaczyk@intel.com>
Reviewed-by: Pawel Wodkowski <pawelx.wodkowski@intel.com>
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Changpeng Liu 2018-05-04 03:22:57 -04:00 committed by Jim Harris
parent 6442451b10
commit f3165e3df3
1 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/vhost/vhost_scsi.c
View File

@ -931,8 +931,7 @@ spdk_vhost_scsi_controller_construct(void)
char *bdev_name, *tgt_num_str;
char *cpumask;
char *name;
char *keyword;
char *dev = NULL, *tgt = NULL;
char *tgt = NULL;
while (sp != NULL) {
if (!spdk_conf_section_match_prefix(sp, "VhostScsi")) {
@ -956,40 +955,25 @@ spdk_vhost_scsi_controller_construct(void)
vdev = spdk_vhost_dev_find(name);
assert(vdev);
dev = spdk_conf_section_get_nval(sp, "Dev", 0);
tgt = spdk_conf_section_get_nval(sp, "Target", 0);
if (dev && tgt) {
SPDK_ERRLOG("Used both 'Dev' and 'Target' keywords in section [VhostScsi%u]\n"
"Please use one.\n", ctrlr_num);
return -1;
} else if (dev) {
SPDK_NOTICELOG("'Dev' mnemonic is deprecated, and will be removed shortly.\n"
"Please, use 'Target' instead\n");
keyword = "Dev";
} else {
keyword = "Target";
}
for (i = 0; ; i++) {
tgt = spdk_conf_section_get_nval(sp, keyword, i);
tgt = spdk_conf_section_get_nval(sp, "Target", i);
if (tgt == NULL) {
break;
}
tgt_num_str = spdk_conf_section_get_nmval(sp, keyword, i, 0);
tgt_num_str = spdk_conf_section_get_nmval(sp, "Target", i, 0);
if (tgt_num_str == NULL) {
SPDK_ERRLOG("%s: Invalid or missing target number\n", name);
return -1;
}
dev_num = (int)strtol(tgt_num_str, NULL, 10);
bdev_name = spdk_conf_section_get_nmval(sp, keyword, i, 1);
bdev_name = spdk_conf_section_get_nmval(sp, "Target", i, 1);
if (bdev_name == NULL) {
SPDK_ERRLOG("%s: Invalid or missing bdev name for target %d\n", name, dev_num);
return -1;
} else if (spdk_conf_section_get_nmval(sp, keyword, i, 2)) {
} else if (spdk_conf_section_get_nmval(sp, "Target", i, 2)) {
SPDK_ERRLOG("%s: Only one LUN per vhost SCSI device supported\n", name);
return -1;
}