Commit d939572a authored by Ziye Yang's avatar Ziye Yang Committed by Daniel Verkamp
Browse files

event/env: remove dpdk_ prefix 



Remove dpdk_ prefix in spdk_app_opts and spdk_env_opts

Change-Id: I6f231f67072b808e84945d41b1fe31a180beb350
Signed-off-by: default avatarZiye Yang <optimistyzy@gmail.com>
Reviewed-on: https://review.gerrithub.io/365787


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent 7c4fe3d2

app/iscsi_tgt/iscsi_tgt.c

+3 −3
Original line number Diff line number Diff line
@@ -140,13 +140,13 @@ main(int argc, char **argv) 
			opts.reactor_mask = optarg;

			break;

		case 'n':

			opts.dpdk_mem_channel = atoi(optarg);

			opts.mem_channel = atoi(optarg);

			break;

		case 'p':

			opts.dpdk_master_core = atoi(optarg);

			opts.master_core = atoi(optarg);

			break;

		case 's':

			opts.dpdk_mem_size = atoi(optarg);

			opts.mem_size = atoi(optarg);

			break;

		case 'b':

			daemon_mode = 1;

app/nvmf_tgt/nvmf_main.c

+3 −3
Original line number Diff line number Diff line
@@ -113,13 +113,13 @@ main(int argc, char **argv) 
			opts.reactor_mask = optarg;

			break;

		case 'n':

			opts.dpdk_mem_channel = atoi(optarg);

			opts.mem_channel = atoi(optarg);

			break;

		case 'p':

			opts.dpdk_master_core = atoi(optarg);

			opts.master_core = atoi(optarg);

			break;

		case 's':

			opts.dpdk_mem_size = atoi(optarg);

			opts.mem_size = atoi(optarg);

			break;

		case 'e':

			opts.tpoint_group_mask = optarg;

app/vhost/vhost.c

+4 −4
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ vhost_app_opts_init(struct spdk_app_opts *opts) 
	spdk_app_opts_init(opts);

	opts->name = "vhost";

	opts->config_file = SPDK_VHOST_DEFAULT_CONFIG;

	opts->dpdk_mem_size = SPDK_VHOST_DEFAULT_MEM_SIZE;

	opts->mem_size = SPDK_VHOST_DEFAULT_MEM_SIZE;

}



static void
@@ -68,7 +68,7 @@ usage(char *executable_name) 
	printf(" -l facility use specific syslog facility (default: %s)\n", defaults.log_facility);

	printf(" -n channel number of memory channels used for DPDK\n");

	printf(" -p core    master (primary) core for DPDK\n");

	printf(" -s size    memory size in MB for DPDK (default: %dMB)\n", defaults.dpdk_mem_size);

	printf(" -s size    memory size in MB for DPDK (default: %dMB)\n", defaults.mem_size);

	printf(" -S dir     directory where to create vhost sockets (default: pwd)\n");

	spdk_tracelog_usage(stdout, "-t");

	printf(" -h         show this usage\n");
@@ -107,13 +107,13 @@ main(int argc, char *argv[]) 
			opts.reactor_mask = optarg;

			break;

		case 'p':

			opts.dpdk_master_core = strtoul(optarg, NULL, 10);

			opts.master_core = strtoul(optarg, NULL, 10);

			break;

		case 'q':

			spdk_g_notice_stderr_flag = 0;

			break;

		case 's':

			opts.dpdk_mem_size = strtoul(optarg, NULL, 10);

			opts.mem_size = strtoul(optarg, NULL, 10);

			break;

		case 'S':

			socket_path = optarg;

examples/nvme/fio_plugin/fio_plugin.c

+1 −1
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ static int spdk_fio_setup(struct thread_data *td) 
	if (!spdk_env_initialized) {

		spdk_env_opts_init(&opts);

		opts.name = "fio";

		opts.dpdk_mem_size = 512;

		opts.mem_size = 512;

		spdk_env_init(&opts);

		spdk_env_initialized = true;

		cpu_core_unaffinitized();

examples/nvme/identify/identify.c

+3 −3
Original line number Diff line number Diff line
@@ -1073,9 +1073,9 @@ int main(int argc, char **argv) 
	spdk_env_opts_init(&opts);

	opts.name = "identify";

	opts.shm_id = g_shm_id;

	opts.dpdk_mem_size = g_dpdk_mem;

	opts.dpdk_mem_channel = 1;

	opts.dpdk_master_core = g_master_core;

	opts.mem_size = g_dpdk_mem;

	opts.mem_channel = 1;

	opts.master_core = g_master_core;

	opts.core_mask = g_core_mask;

	if (g_trid.trtype != SPDK_NVME_TRANSPORT_PCIE) {

		opts.no_pci = true;