From f3165e3df3ba59c37b0451c423153e785d8ba225 Mon Sep 17 00:00:00 2001 From: Changpeng Liu Date: Fri, 4 May 2018 03:22:57 -0400 Subject: [PATCH] vhost/scsi: remove the support of "Dev" for configuration file "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 Reviewed-on: https://review.gerrithub.io/409989 Tested-by: SPDK Automated Test System Reviewed-by: Dariusz Stojaczyk Reviewed-by: Pawel Wodkowski Reviewed-by: Daniel Verkamp Reviewed-by: Jim Harris --- lib/vhost/vhost_scsi.c | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/lib/vhost/vhost_scsi.c b/lib/vhost/vhost_scsi.c index dcb5f98d1..4ed9d448e 100644 --- a/lib/vhost/vhost_scsi.c +++ b/lib/vhost/vhost_scsi.c @@ -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; }