Commit 8c5a2b08 authored by Ben Walker's avatar Ben Walker
Browse files

nvmf: Rename some uses of virtual to virt for C++ compat 



'virtual' is a keyword in C++, so avoid using it in variable
and structure names in case any files are eventually
included from a C++ project.

Change-Id: I2122750445def63038af68a3000758e33b937f9d
Signed-off-by: default avatarBen Walker <benjamin.walker@intel.com>
parent 882b790b

app/nvmf_tgt/conf.c

+4 −4
Original line number Diff line number Diff line
@@ -582,8 +582,8 @@ spdk_nvmf_parse_subsystem(struct spdk_conf_section *sp) 
			return -1;

		}



		subsystem->dev.virtual.ns_count = 0;

		snprintf(subsystem->dev.virtual.sn, MAX_SN_LEN, "%s", sn);

		subsystem->dev.virt.ns_count = 0;

		snprintf(subsystem->dev.virt.sn, MAX_SN_LEN, "%s", sn);

		subsystem->ops = &spdk_nvmf_virtual_ctrlr_ops;



		for (i = 0; i < MAX_VIRTUAL_NAMESPACE; i++) {
@@ -778,8 +778,8 @@ spdk_nvmf_parse_subsystem_for_rpc(const char *name, 
			return -1;

		}



		subsystem->dev.virtual.ns_count = 0;

		snprintf(subsystem->dev.virtual.sn, MAX_SN_LEN, "%s", sn);

		subsystem->dev.virt.ns_count = 0;

		snprintf(subsystem->dev.virt.sn, MAX_SN_LEN, "%s", sn);

		subsystem->ops = &spdk_nvmf_virtual_ctrlr_ops;



		for (i = 0; i < num_devs; i++) {

app/nvmf_tgt/nvmf_rpc.c

+3 −3
Original line number Diff line number Diff line
@@ -117,15 +117,15 @@ dump_nvmf_subsystem(struct spdk_json_write_ctx *w, struct spdk_nvmf_subsystem *s 
		} else {

			int i;

			spdk_json_write_name(w, "serial_number");

			spdk_json_write_string(w, subsystem->dev.virtual.sn);

			spdk_json_write_string(w, subsystem->dev.virt.sn);

			spdk_json_write_name(w, "namespaces");

			spdk_json_write_array_begin(w);

			for (i = 0; i < subsystem->dev.virtual.ns_count; i++) {

			for (i = 0; i < subsystem->dev.virt.ns_count; i++) {

				spdk_json_write_object_begin(w);

				spdk_json_write_name(w, "nsid");

				spdk_json_write_int32(w, i + 1);

				spdk_json_write_name(w, "name");

				spdk_json_write_string(w, subsystem->dev.virtual.ns_list[i]->name);

				spdk_json_write_string(w, subsystem->dev.virt.ns_list[i]->name);

				spdk_json_write_object_end(w);

			}

			spdk_json_write_array_end(w);

app/nvmf_tgt/nvmf_tgt.c

+6 −6
Original line number Diff line number Diff line
@@ -95,9 +95,9 @@ nvmf_tgt_delete_subsystem(struct nvmf_tgt_subsystem *app_subsys) 


	if (subsystem->subtype == SPDK_NVMF_SUBTYPE_NVME &&

	    subsystem->mode == NVMF_SUBSYSTEM_MODE_VIRTUAL) {

		for (i = 0; i < subsystem->dev.virtual.ns_count; i++) {

			spdk_put_io_channel(subsystem->dev.virtual.ch[i]);

			subsystem->dev.virtual.ch[i] = NULL;

		for (i = 0; i < subsystem->dev.virt.ns_count; i++) {

			spdk_put_io_channel(subsystem->dev.virt.ch[i]);

			subsystem->dev.virt.ch[i] = NULL;

		}

	}
@@ -200,11 +200,11 @@ nvmf_tgt_start_subsystem(struct spdk_event *event) 


	if (subsystem->subtype == SPDK_NVMF_SUBTYPE_NVME &&

	    subsystem->mode == NVMF_SUBSYSTEM_MODE_VIRTUAL) {

		for (i = 0; i < subsystem->dev.virtual.ns_count; i++) {

			bdev = subsystem->dev.virtual.ns_list[i];

		for (i = 0; i < subsystem->dev.virt.ns_count; i++) {

			bdev = subsystem->dev.virt.ns_list[i];

			ch = spdk_bdev_get_io_channel(bdev, SPDK_IO_PRIORITY_DEFAULT);

			assert(ch != NULL);

			subsystem->dev.virtual.ch[i] = ch;

			subsystem->dev.virt.ch[i] = ch;

		}

	}

lib/nvmf/subsystem.c

+3 −3
Original line number Diff line number Diff line
@@ -307,14 +307,14 @@ spdk_nvmf_subsystem_add_ns(struct spdk_nvmf_subsystem *subsystem, struct spdk_bd 
	int i = 0;



	assert(subsystem->mode == NVMF_SUBSYSTEM_MODE_VIRTUAL);

	while (i < MAX_VIRTUAL_NAMESPACE && subsystem->dev.virtual.ns_list[i]) {

	while (i < MAX_VIRTUAL_NAMESPACE && subsystem->dev.virt.ns_list[i]) {

		i++;

	}

	if (i == MAX_VIRTUAL_NAMESPACE) {

		SPDK_ERRLOG("spdk_nvmf_subsystem_add_ns() failed\n");

		return -1;

	}

	subsystem->dev.virtual.ns_list[i] = bdev;

	subsystem->dev.virtual.ns_count++;

	subsystem->dev.virt.ns_list[i] = bdev;

	subsystem->dev.virt.ns_count++;

	return 0;

}

lib/nvmf/subsystem.h

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ struct spdk_nvmf_subsystem { 
			struct spdk_bdev *ns_list[MAX_VIRTUAL_NAMESPACE];

			struct spdk_io_channel *ch[MAX_VIRTUAL_NAMESPACE];

			uint16_t ns_count;

		} virtual;

		} virt;

	} dev;



	const struct spdk_nvmf_ctrlr_ops *ops;