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

nvmf: Rename SubsystemGroup to Susbystem in conf file

Browse Source 
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 <benjamin.walker@intel.com>
This commit is contained in:
Ben Walker 2016-06-08 11:22:36 -07:00 committed by Benjamin Walker
parent 53b31afe7c
commit 58f9dcd220
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
etc/spdk/nvmf.conf.in
View File

@ -93,7 +93,7 @@
# domain, bus, device, and function. The format is dddd:bb:dd.f, which is # 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 # 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 # 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 # Alternatively, the user can specify ClaimAllDevices. All
# NVMe devices will be claimed and named Nvme0, Nvme1, etc. # NVMe devices will be claimed and named Nvme0, Nvme1, etc.
@ -102,9 +102,9 @@
BDF 0000:01:00.0 Nvme1 BDF 0000:01:00.0 Nvme1
# ClaimAllDevices Yes # 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 # 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. # remote fabric transport and NVMf protocol connection requests.
# #
# Each approved NVMf connection represents a specific virtual controller # Each approved NVMf connection represents a specific virtual controller
@ -120,13 +120,13 @@
# access to the same subsystem. # access to the same subsystem.
# Each Controller identifies a specific HW device from the Nvme whitelist # Each Controller identifies a specific HW device from the Nvme whitelist
# section above. # section above.
[SubsystemGroup1] [Subsystem1]
SubsystemName cnode1 SubsystemName cnode1
Mapping Port1 Host1 Mapping Port1 Host1
# Using NVME 0 namespace 1 # Using NVME 0 namespace 1
Controller0 Nvme0 Controller0 Nvme0
[SubsystemGroup2] [Subsystem2]
SubsystemName cnode2 SubsystemName cnode2
Mapping Port2 Host2 Mapping Port2 Host2
# Using NVME 1 namespace 1 # Using NVME 1 namespace 1

2
lib/nvmf/subsystem_grp.c
View File

@ -413,7 +413,7 @@ spdk_initialize_nvmf_subsystems(void)
sp = spdk_conf_first_section(NULL); sp = spdk_conf_first_section(NULL);
while (sp != 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) { if (sp->num > SPDK_CN_TAG_MAX) {
SPDK_ERRLOG("tag %d is invalid\n", sp->num); SPDK_ERRLOG("tag %d is invalid\n", sp->num);
SPDK_TRACELOG(SPDK_TRACE_DEBUG, "tag %d is invalid\n", sp->num); SPDK_TRACELOG(SPDK_TRACE_DEBUG, "tag %d is invalid\n", sp->num);

2
test/nvmf/nvmf.conf
View File

@ -21,7 +21,7 @@
ClaimAllDevices Yes ClaimAllDevices Yes
UnbindFromKernel Yes UnbindFromKernel Yes
[SubsystemGroup1] [Subsystem1]
SubsystemName cnode1 SubsystemName cnode1
Mapping Port1 Host1 Mapping Port1 Host1
QueueDepth 128 QueueDepth 128