From 58f9dcd220b4ef4ace97db0f5872c3d5404f2fa3 Mon Sep 17 00:00:00 2001 From: Ben Walker Date: Wed, 8 Jun 2016 11:22:36 -0700 Subject: [PATCH] nvmf: Rename SubsystemGroup to Susbystem in conf file The section is really defining a subsystem as defined by the NVMf specification. There does not appear to be any need for a group of subsystems. This change only updates the configuration file. It does not remove all references to a subsystem group from the code. Change-Id: I38e62735a5ac924dcafacb3c9a332a103d751d4a Signed-off-by: Ben Walker --- etc/spdk/nvmf.conf.in | 10 +++++----- lib/nvmf/subsystem_grp.c | 2 +- test/nvmf/nvmf.conf | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/etc/spdk/nvmf.conf.in b/etc/spdk/nvmf.conf.in index b5a32c1ff..74b65edd6 100644 --- a/etc/spdk/nvmf.conf.in +++ b/etc/spdk/nvmf.conf.in @@ -93,7 +93,7 @@ # domain, bus, device, and function. The format is dddd:bb:dd.f, which is # the same format displayed by lspci or in /sys/bus/pci/devices. The second # argument is a "name" for the device that can be anything. The name -# is referenced later in the SubsystemGroup section. +# is referenced later in the Subsystem section. # # Alternatively, the user can specify ClaimAllDevices. All # NVMe devices will be claimed and named Nvme0, Nvme1, etc. @@ -102,9 +102,9 @@ BDF 0000:01:00.0 Nvme1 # ClaimAllDevices Yes -# Users should change the NVMfSubsystem section(s) below to define the +# Users should change the Subsystem section(s) below to define the # set of local NVMe resources that will be accessible by specific groups -# of remote initiators. These mappings will be inspected to approve +# of hosts. These mappings will be inspected to approve # remote fabric transport and NVMf protocol connection requests. # # Each approved NVMf connection represents a specific virtual controller @@ -120,13 +120,13 @@ # access to the same subsystem. # Each Controller identifies a specific HW device from the Nvme whitelist # section above. -[SubsystemGroup1] +[Subsystem1] SubsystemName cnode1 Mapping Port1 Host1 # Using NVME 0 namespace 1 Controller0 Nvme0 -[SubsystemGroup2] +[Subsystem2] SubsystemName cnode2 Mapping Port2 Host2 # Using NVME 1 namespace 1 diff --git a/lib/nvmf/subsystem_grp.c b/lib/nvmf/subsystem_grp.c index 03a534969..be14e910d 100644 --- a/lib/nvmf/subsystem_grp.c +++ b/lib/nvmf/subsystem_grp.c @@ -413,7 +413,7 @@ spdk_initialize_nvmf_subsystems(void) sp = spdk_conf_first_section(NULL); while (sp != NULL) { - if (spdk_conf_section_match_prefix(sp, "SubsystemGroup")) { + if (spdk_conf_section_match_prefix(sp, "Subsystem")) { if (sp->num > SPDK_CN_TAG_MAX) { SPDK_ERRLOG("tag %d is invalid\n", sp->num); SPDK_TRACELOG(SPDK_TRACE_DEBUG, "tag %d is invalid\n", sp->num); diff --git a/test/nvmf/nvmf.conf b/test/nvmf/nvmf.conf index 119d9327b..755ef611b 100644 --- a/test/nvmf/nvmf.conf +++ b/test/nvmf/nvmf.conf @@ -21,7 +21,7 @@ ClaimAllDevices Yes UnbindFromKernel Yes -[SubsystemGroup1] +[Subsystem1] SubsystemName cnode1 Mapping Port1 Host1 QueueDepth 128