Commit 58f9dcd2 authored by Ben Walker's avatar Ben Walker Committed by Benjamin Walker
Browse files

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: default avatarBen Walker <benjamin.walker@intel.com>
parent 53b31afe

etc/spdk/nvmf.conf.in

+5 −5
Original line number Diff line number Diff line
@@ -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

lib/nvmf/subsystem_grp.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

test/nvmf/nvmf.conf

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
  ClaimAllDevices Yes

  UnbindFromKernel Yes



[SubsystemGroup1]

[Subsystem1]

  SubsystemName cnode1

  Mapping Port1 Host1

  QueueDepth 128