X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=cli%2Fbabeltrace-cfg-cli-args.c;h=1a41bcbf29859707cf45c772521d931c7a42f488;hb=b19ff26f04df428047676dd736bd7cc9473906fe;hp=b844b4e429bcab1e1be1c7eedac2cb46b3829955;hpb=da91b29ad2964b85601e25843f1dca92f6c97406;p=babeltrace.git

diff --git a/cli/babeltrace-cfg-cli-args.c b/cli/babeltrace-cfg-cli-args.c
index b844b4e4..1a41bcbf 100644
--- a/cli/babeltrace-cfg-cli-args.c
+++ b/cli/babeltrace-cfg-cli-args.c
@@ -34,8 +34,6 @@
 #include <inttypes.h>
 #include <babeltrace/babeltrace.h>
 #include <babeltrace/common-internal.h>
-#include <babeltrace/values.h>
-#include <babeltrace/private-values.h>
 #include <popt.h>
 #include <glib.h>
 #include <sys/types.h>
@@ -85,7 +83,7 @@ struct ini_parsing_state {
 	GScanner *scanner;
 
 	/* Output map value object being filled (owned by this) */
-	struct bt_private_value *params;
+	bt_value *params;
 
 	/* Next expected FSM state */
 	enum ini_parsing_fsm_state expecting;
@@ -122,8 +120,8 @@ struct text_legacy_opts {
 	GString *output;
 	GString *dbg_info_dir;
 	GString *dbg_info_target_prefix;
-	struct bt_value *names;
-	struct bt_value *fields;
+	const bt_value *names;
+	const bt_value *fields;
 
 	/* Flags */
 	bool no_delta;
@@ -195,7 +193,7 @@ int ini_handle_state(struct ini_parsing_state *state)
 {
 	int ret = 0;
 	GTokenType token_type;
-	struct bt_value *value = NULL;
+	bt_value *value = NULL;
 
 	token_type = g_scanner_get_next_token(state->scanner);
 	if (token_type == G_TOKEN_EOF) {
@@ -242,9 +240,8 @@ int ini_handle_state(struct ini_parsing_state *state)
 			goto error;
 		}
 
-		if (bt_value_map_has_entry(
-				bt_value_borrow_from_private(state->params),
-				state->last_map_key)) {
+		if (bt_value_map_has_entry(state->params,
+					   state->last_map_key)) {
 			g_string_append_printf(state->ini_error,
 				"Duplicate parameter key: `%s`\n",
 				state->last_map_key);
@@ -295,22 +292,16 @@ int ini_handle_state(struct ini_parsing_state *state)
 				goto error;
 			}
 
-			value = bt_value_borrow_from_private(
-				bt_private_value_integer_create_init(
-					(int64_t) int_val));
+			value = bt_value_integer_create_init((int64_t)int_val);
 			break;
 		}
 		case G_TOKEN_FLOAT:
 			/* Positive floating point number */
-			value = bt_value_borrow_from_private(
-				bt_private_value_real_create_init(
-					state->scanner->value.v_float));
+			value = bt_value_real_create_init(state->scanner->value.v_float);
 			break;
 		case G_TOKEN_STRING:
 			/* Quoted string */
-			value = bt_value_borrow_from_private(
-				bt_private_value_string_create_init(
-					state->scanner->value.v_string));
+			value = bt_value_string_create_init(state->scanner->value.v_string);
 			break;
 		case G_TOKEN_IDENTIFIER:
 		{
@@ -332,17 +323,14 @@ int ini_handle_state(struct ini_parsing_state *state)
 			} else if (!strcmp(id, "true") || !strcmp(id, "TRUE") ||
 					!strcmp(id, "yes") ||
 					!strcmp(id, "YES")) {
-				value = bt_value_borrow_from_private(
-					bt_private_value_bool_create_init(true));
+				value = bt_value_bool_create_init(true);
 			} else if (!strcmp(id, "false") ||
 					!strcmp(id, "FALSE") ||
 					!strcmp(id, "no") ||
 					!strcmp(id, "NO")) {
-				value = bt_value_borrow_from_private(
-					bt_private_value_bool_create_init(false));
+				value = bt_value_bool_create_init(false);
 			} else {
-				value = bt_value_borrow_from_private(
-					bt_private_value_string_create_init(id));
+				value = bt_value_string_create_init(id);
 			}
 			break;
 		}
@@ -375,16 +363,12 @@ int ini_handle_state(struct ini_parsing_state *state)
 				goto error;
 			}
 
-			value = bt_value_borrow_from_private(
-				bt_private_value_integer_create_init(
-					-((int64_t) int_val)));
+			value = bt_value_integer_create_init(-((int64_t)int_val));
 			break;
 		}
 		case G_TOKEN_FLOAT:
 			/* Negative floating point number */
-			value = bt_value_borrow_from_private(
-				bt_private_value_real_create_init(
-					-state->scanner->value.v_float));
+			value = bt_value_real_create_init(-state->scanner->value.v_float);
 			break;
 		default:
 			/* Unset value variable will trigger the error */
@@ -425,7 +409,7 @@ error:
 
 success:
 	if (value) {
-		if (bt_private_value_map_insert_entry(state->params,
+		if (bt_value_map_insert_entry(state->params,
 				state->last_map_key, value)) {
 			/* Only override return value on error */
 			ret = -1;
@@ -433,7 +417,7 @@ success:
 	}
 
 end:
-	BT_OBJECT_PUT_REF_AND_RESET(value);
+	BT_VALUE_PUT_REF_AND_RESET(value);
 	return ret;
 }
 
@@ -443,7 +427,7 @@ end:
  * Return value is owned by the caller.
  */
 static
-struct bt_private_value *bt_private_value_from_ini(const char *arg,
+bt_value *bt_value_from_ini(const char *arg,
 		GString *ini_error)
 {
 	/* Lexical scanner configuration */
@@ -523,7 +507,7 @@ struct bt_private_value *bt_private_value_from_ini(const char *arg,
 		.ini_error = ini_error,
 	};
 
-	state.params = bt_private_value_map_create();
+	state.params = bt_value_map_create();
 	if (!state.params) {
 		goto error;
 	}
@@ -551,7 +535,7 @@ struct bt_private_value *bt_private_value_from_ini(const char *arg,
 	goto end;
 
 error:
-	BT_OBJECT_PUT_REF_AND_RESET(state.params);
+	BT_VALUE_PUT_REF_AND_RESET(state.params);
 
 end:
 	if (state.scanner) {
@@ -569,9 +553,9 @@ end:
  * Return value is owned by the caller.
  */
 static
-struct bt_private_value *bt_private_value_from_arg(const char *arg)
+bt_value *bt_value_from_arg(const char *arg)
 {
-	struct bt_private_value *params = NULL;
+	bt_value *params = NULL;
 	GString *ini_error = NULL;
 
 	ini_error = g_string_new(NULL);
@@ -581,7 +565,7 @@ struct bt_private_value *bt_private_value_from_arg(const char *arg)
 	}
 
 	/* Try INI-style parsing */
-	params = bt_private_value_from_ini(arg, ini_error);
+	params = bt_value_from_ini(arg, ini_error);
 	if (!params) {
 		printf_err("%s", ini_error->str);
 		goto end;
@@ -754,7 +738,7 @@ void print_version(void)
  * Destroys a component configuration.
  */
 static
-void bt_config_component_destroy(struct bt_object *obj)
+void bt_config_component_destroy(bt_object *obj)
 {
 	struct bt_config_component *bt_config_component =
 		container_of(obj, struct bt_config_component, base);
@@ -775,7 +759,7 @@ void bt_config_component_destroy(struct bt_object *obj)
 		g_string_free(bt_config_component->instance_name, TRUE);
 	}
 
-	BT_OBJECT_PUT_REF_AND_RESET(bt_config_component->params);
+	BT_VALUE_PUT_REF_AND_RESET(bt_config_component->params);
 	g_free(bt_config_component);
 
 end:
@@ -824,7 +808,7 @@ struct bt_config_component *bt_config_component_create(
 	}
 
 	/* Start with empty parameters */
-	cfg_component->params = bt_private_value_map_create();
+	cfg_component->params = bt_value_map_create();
 	if (!cfg_component->params) {
 		print_err_oom();
 		goto error;
@@ -882,7 +866,7 @@ end:
  * Destroys a configuration.
  */
 static
-void bt_config_destroy(struct bt_object *obj)
+void bt_config_destroy(bt_object *obj)
 {
 	struct bt_config *cfg =
 		container_of(obj, struct bt_config, base);
@@ -891,7 +875,7 @@ void bt_config_destroy(struct bt_object *obj)
 		goto end;
 	}
 
-	BT_OBJECT_PUT_REF_AND_RESET(cfg->plugin_paths);
+	BT_VALUE_PUT_REF_AND_RESET(cfg->plugin_paths);
 
 	switch (cfg->command) {
 	case BT_CONFIG_COMMAND_RUN:
@@ -1023,13 +1007,13 @@ GScanner *create_csv_identifiers_scanner(void)
  * Return value is owned by the caller.
  */
 static
-struct bt_private_value *names_from_arg(const char *arg)
+bt_value *names_from_arg(const char *arg)
 {
 	GScanner *scanner = NULL;
-	struct bt_private_value *names = NULL;
+	bt_value *names = NULL;
 	bool found_all = false, found_none = false, found_item = false;
 
-	names = bt_private_value_array_create();
+	names = bt_value_array_create();
 	if (!names) {
 		print_err_oom();
 		goto error;
@@ -1054,33 +1038,33 @@ struct bt_private_value *names_from_arg(const char *arg)
 					!strcmp(identifier, "args") ||
 					!strcmp(identifier, "arg")) {
 				found_item = true;
-				if (bt_private_value_array_append_string_element(names,
+				if (bt_value_array_append_string_element(names,
 						"payload")) {
 					goto error;
 				}
 			} else if (!strcmp(identifier, "context") ||
 					!strcmp(identifier, "ctx")) {
 				found_item = true;
-				if (bt_private_value_array_append_string_element(names,
+				if (bt_value_array_append_string_element(names,
 						"context")) {
 					goto error;
 				}
 			} else if (!strcmp(identifier, "scope") ||
 					!strcmp(identifier, "header")) {
 				found_item = true;
-				if (bt_private_value_array_append_string_element(names,
+				if (bt_value_array_append_string_element(names,
 						identifier)) {
 					goto error;
 				}
 			} else if (!strcmp(identifier, "all")) {
 				found_all = true;
-				if (bt_private_value_array_append_string_element(names,
+				if (bt_value_array_append_string_element(names,
 						identifier)) {
 					goto error;
 				}
 			} else if (!strcmp(identifier, "none")) {
 				found_none = true;
-				if (bt_private_value_array_append_string_element(names,
+				if (bt_value_array_append_string_element(names,
 						identifier)) {
 					goto error;
 				}
@@ -1110,7 +1094,7 @@ end:
 	 * least one item is specified.
 	 */
 	if (found_item && !found_none && !found_all) {
-		if (bt_private_value_array_append_string_element(names, "none")) {
+		if (bt_value_array_append_string_element(names, "none")) {
 			goto error;
 		}
 	}
@@ -1120,7 +1104,7 @@ end:
 	return names;
 
 error:
-	BT_OBJECT_PUT_REF_AND_RESET(names);
+	BT_VALUE_PUT_REF_AND_RESET(names);
 	if (scanner) {
 		g_scanner_destroy(scanner);
 	}
@@ -1135,12 +1119,12 @@ error:
  * Return value is owned by the caller.
  */
 static
-struct bt_private_value *fields_from_arg(const char *arg)
+bt_value *fields_from_arg(const char *arg)
 {
 	GScanner *scanner = NULL;
-	struct bt_private_value *fields;
+	bt_value *fields;
 
-	fields = bt_private_value_array_create();
+	fields = bt_value_array_create();
 	if (!fields) {
 		print_err_oom();
 		goto error;
@@ -1170,7 +1154,7 @@ struct bt_private_value *fields_from_arg(const char *arg)
 					!strcmp(identifier, "emf") ||
 					!strcmp(identifier, "callsite") ||
 					!strcmp(identifier, "all")) {
-				if (bt_private_value_array_append_string_element(fields,
+				if (bt_value_array_append_string_element(fields,
 						identifier)) {
 					goto error;
 				}
@@ -1193,7 +1177,7 @@ struct bt_private_value *fields_from_arg(const char *arg)
 	goto end;
 
 error:
-	BT_OBJECT_PUT_REF_AND_RESET(fields);
+	BT_VALUE_PUT_REF_AND_RESET(fields);
 
 end:
 	if (scanner) {
@@ -1224,7 +1208,7 @@ void append_param_arg(GString *params_arg, const char *key, const char *value)
  */
 static
 int insert_flat_params_from_array(GString *params_arg,
-		struct bt_value *names_array, const char *prefix)
+		const bt_value *names_array, const char *prefix)
 {
 	int ret = 0;
 	int i;
@@ -1254,8 +1238,9 @@ int insert_flat_params_from_array(GString *params_arg,
 	}
 
 	for (i = 0; i < bt_value_array_get_size(names_array); i++) {
-		struct bt_value *str_obj =
-			bt_value_array_borrow_element_by_index(names_array, i);
+		const bt_value *str_obj =
+			bt_value_array_borrow_element_by_index_const(names_array,
+								     i);
 		const char *suffix;
 		bool is_default = false;
 
@@ -1265,11 +1250,7 @@ int insert_flat_params_from_array(GString *params_arg,
 			goto end;
 		}
 
-		ret = bt_value_string_get(str_obj, &suffix);
-		if (ret) {
-			printf_err("Unexpected error\n");
-			goto end;
-		}
+		suffix = bt_value_string_get(str_obj);
 
 		g_string_assign(tmpstr, prefix);
 		g_string_append(tmpstr, "-");
@@ -1398,7 +1379,7 @@ static
 int add_run_cfg_comp_check_name(struct bt_config *cfg,
 		struct bt_config_component *cfg_comp,
 		enum bt_config_component_dest dest,
-		struct bt_private_value *instance_names)
+		bt_value *instance_names)
 {
 	int ret = 0;
 
@@ -1408,15 +1389,15 @@ int add_run_cfg_comp_check_name(struct bt_config *cfg,
 		goto end;
 	}
 
-	if (bt_value_map_has_entry(bt_value_borrow_from_private(instance_names),
-			cfg_comp->instance_name->str)) {
+	if (bt_value_map_has_entry(instance_names,
+				   cfg_comp->instance_name->str)) {
 		printf_err("Duplicate component instance name:\n    %s\n",
 			cfg_comp->instance_name->str);
 		ret = -1;
 		goto end;
 	}
 
-	if (bt_private_value_map_insert_entry(instance_names,
+	if (bt_value_map_insert_entry(instance_names,
 			cfg_comp->instance_name->str, bt_value_null)) {
 		print_err_oom();
 		ret = -1;
@@ -1430,7 +1411,7 @@ end:
 }
 
 static
-int append_env_var_plugin_paths(struct bt_private_value *plugin_paths)
+int append_env_var_plugin_paths(bt_value *plugin_paths)
 {
 	int ret = 0;
 	const char *envvar;
@@ -1456,7 +1437,7 @@ end:
 }
 
 static
-int append_home_and_system_plugin_paths(struct bt_private_value *plugin_paths,
+int append_home_and_system_plugin_paths(bt_value *plugin_paths,
 		bool omit_system_plugin_path, bool omit_home_plugin_path)
 {
 	int ret;
@@ -1503,7 +1484,7 @@ int append_home_and_system_plugin_paths_cfg(struct bt_config *cfg)
 
 static
 struct bt_config *bt_config_base_create(enum bt_config_command command,
-		struct bt_private_value *initial_plugin_paths,
+		const bt_value *initial_plugin_paths,
 		bool needs_plugins)
 {
 	struct bt_config *cfg;
@@ -1520,9 +1501,13 @@ struct bt_config *bt_config_base_create(enum bt_config_command command,
 	cfg->command_needs_plugins = needs_plugins;
 
 	if (initial_plugin_paths) {
-		cfg->plugin_paths = bt_object_get_ref(initial_plugin_paths);
+		bt_value *initial_plugin_paths_copy;
+
+		(void) bt_value_copy(initial_plugin_paths,
+			&initial_plugin_paths_copy);
+		cfg->plugin_paths = initial_plugin_paths_copy;
 	} else {
-		cfg->plugin_paths = bt_private_value_array_create();
+		cfg->plugin_paths = bt_value_array_create();
 		if (!cfg->plugin_paths) {
 			print_err_oom();
 			goto error;
@@ -1540,7 +1525,7 @@ end:
 
 static
 struct bt_config *bt_config_run_create(
-		struct bt_private_value *initial_plugin_paths)
+		const bt_value *initial_plugin_paths)
 {
 	struct bt_config *cfg;
 
@@ -1590,7 +1575,7 @@ end:
 
 static
 struct bt_config *bt_config_list_plugins_create(
-		struct bt_private_value *initial_plugin_paths)
+		const bt_value *initial_plugin_paths)
 {
 	struct bt_config *cfg;
 
@@ -1612,7 +1597,7 @@ end:
 
 static
 struct bt_config *bt_config_help_create(
-		struct bt_private_value *initial_plugin_paths)
+		const bt_value *initial_plugin_paths)
 {
 	struct bt_config *cfg;
 
@@ -1624,8 +1609,7 @@ struct bt_config *bt_config_help_create(
 	}
 
 	cfg->cmd_data.help.cfg_component =
-		bt_config_component_create(BT_COMPONENT_CLASS_TYPE_UNKNOWN,
-			NULL, NULL);
+		bt_config_component_create(-1, NULL, NULL);
 	if (!cfg->cmd_data.help.cfg_component) {
 		goto error;
 	}
@@ -1641,7 +1625,7 @@ end:
 
 static
 struct bt_config *bt_config_query_create(
-		struct bt_private_value *initial_plugin_paths)
+		const bt_value *initial_plugin_paths)
 {
 	struct bt_config *cfg;
 
@@ -1669,7 +1653,7 @@ end:
 
 static
 struct bt_config *bt_config_print_ctf_metadata_create(
-		struct bt_private_value *initial_plugin_paths)
+		const bt_value *initial_plugin_paths)
 {
 	struct bt_config *cfg;
 
@@ -1703,7 +1687,7 @@ end:
 
 static
 struct bt_config *bt_config_print_lttng_live_sessions_create(
-		struct bt_private_value *initial_plugin_paths)
+		const bt_value *initial_plugin_paths)
 {
 	struct bt_config *cfg;
 
@@ -1738,7 +1722,7 @@ end:
 
 static
 int bt_config_append_plugin_paths_check_setuid_setgid(
-		struct bt_private_value *plugin_paths, const char *arg)
+		bt_value *plugin_paths, const char *arg)
 {
 	int ret = 0;
 
@@ -1839,7 +1823,7 @@ static
 struct bt_config *bt_config_help_from_args(int argc, const char *argv[],
 		int *retcode, bool force_omit_system_plugin_path,
 		bool force_omit_home_plugin_path,
-		struct bt_private_value *initial_plugin_paths)
+		const bt_value *initial_plugin_paths)
 {
 	poptContext pc = NULL;
 	char *arg = NULL;
@@ -1925,8 +1909,6 @@ struct bt_config *bt_config_help_from_args(int argc, const char *argv[],
 				comp_cls_name);
 		} else {
 			/* Fall back to plugin help */
-			cfg->cmd_data.help.cfg_component->type =
-				BT_COMPONENT_CLASS_TYPE_UNKNOWN;
 			g_string_assign(
 				cfg->cmd_data.help.cfg_component->plugin_name,
 				leftover);
@@ -2003,7 +1985,7 @@ static
 struct bt_config *bt_config_query_from_args(int argc, const char *argv[],
 		int *retcode, bool force_omit_system_plugin_path,
 		bool force_omit_home_plugin_path,
-		struct bt_private_value *initial_plugin_paths)
+		const bt_value *initial_plugin_paths)
 {
 	poptContext pc = NULL;
 	char *arg = NULL;
@@ -2011,7 +1993,7 @@ struct bt_config *bt_config_query_from_args(int argc, const char *argv[],
 	int ret;
 	struct bt_config *cfg = NULL;
 	const char *leftover;
-	struct bt_private_value *params = bt_private_value_null;
+	bt_value *params = bt_value_null;
 
 	*retcode = 0;
 	cfg = bt_config_query_create(initial_plugin_paths);
@@ -2054,8 +2036,8 @@ struct bt_config *bt_config_query_from_args(int argc, const char *argv[],
 			break;
 		case OPT_PARAMS:
 		{
-			bt_object_put_ref(params);
-			params = bt_private_value_from_arg(arg);
+			bt_value_put_ref(params);
+			params = bt_value_from_arg(arg);
 			if (!params) {
 				printf_err("Invalid format for --params option's argument:\n    %s\n",
 					arg);
@@ -2145,7 +2127,7 @@ end:
 		poptFreeContext(pc);
 	}
 
-	bt_object_put_ref(params);
+	bt_value_put_ref(params);
 	free(arg);
 	return cfg;
 }
@@ -2192,7 +2174,7 @@ static
 struct bt_config *bt_config_list_plugins_from_args(int argc, const char *argv[],
 		int *retcode, bool force_omit_system_plugin_path,
 		bool force_omit_home_plugin_path,
-		struct bt_private_value *initial_plugin_paths)
+		const bt_value *initial_plugin_paths)
 {
 	poptContext pc = NULL;
 	char *arg = NULL;
@@ -2382,21 +2364,22 @@ static
 struct bt_config *bt_config_run_from_args(int argc, const char *argv[],
 		int *retcode, bool force_omit_system_plugin_path,
 		bool force_omit_home_plugin_path,
-		struct bt_private_value *initial_plugin_paths)
+		const bt_value *initial_plugin_paths)
 {
 	poptContext pc = NULL;
 	char *arg = NULL;
 	struct bt_config_component *cur_cfg_comp = NULL;
 	enum bt_config_component_dest cur_cfg_comp_dest =
 			BT_CONFIG_COMPONENT_DEST_UNKNOWN;
-	struct bt_private_value *cur_base_params = NULL;
+	bt_value *cur_base_params = NULL;
 	int opt, ret = 0;
 	struct bt_config *cfg = NULL;
-	struct bt_private_value *instance_names = NULL;
-	struct bt_private_value *connection_args = NULL;
+	bt_value *instance_names = NULL;
+	bt_value *connection_args = NULL;
 	GString *cur_param_key = NULL;
 	char error_buf[256] = { 0 };
 	long retry_duration = -1;
+	enum bt_value_status status;
 	struct poptOption run_long_options[] = {
 		{ "base-params", 'b', POPT_ARG_STRING, NULL, OPT_BASE_PARAMS, NULL, NULL },
 		{ "component", 'c', POPT_ARG_STRING, NULL, OPT_COMPONENT, NULL, NULL },
@@ -2435,19 +2418,19 @@ struct bt_config *bt_config_run_from_args(int argc, const char *argv[],
 	cfg->cmd_data.run.retry_duration_us = 100000;
 	cfg->omit_system_plugin_path = force_omit_system_plugin_path;
 	cfg->omit_home_plugin_path = force_omit_home_plugin_path;
-	cur_base_params = bt_private_value_map_create();
+	cur_base_params = bt_value_map_create();
 	if (!cur_base_params) {
 		print_err_oom();
 		goto error;
 	}
 
-	instance_names = bt_private_value_map_create();
+	instance_names = bt_value_map_create();
 	if (!instance_names) {
 		print_err_oom();
 		goto error;
 	}
 
-	connection_args = bt_private_value_array_create();
+	connection_args = bt_value_array_create();
 	if (!connection_args) {
 		print_err_oom();
 		goto error;
@@ -2520,10 +2503,10 @@ struct bt_config *bt_config_run_from_args(int argc, const char *argv[],
 			}
 
 			BT_ASSERT(cur_base_params);
-			bt_object_put_ref(cur_cfg_comp->params);
-			cur_cfg_comp->params = bt_value_copy(
-				bt_value_borrow_from_private(cur_base_params));
-			if (!cur_cfg_comp->params) {
+			bt_value_put_ref(cur_cfg_comp->params);
+			status = bt_value_copy(cur_base_params,
+				&cur_cfg_comp->params);
+			if (status != BT_VALUE_STATUS_OK) {
 				print_err_oom();
 				goto error;
 			}
@@ -2533,8 +2516,8 @@ struct bt_config *bt_config_run_from_args(int argc, const char *argv[],
 		}
 		case OPT_PARAMS:
 		{
-			struct bt_private_value *params;
-			struct bt_private_value *params_to_set;
+			bt_value *params;
+			bt_value *params_to_set;
 
 			if (!cur_cfg_comp) {
 				printf_err("Cannot add parameters to unavailable component:\n    %s\n",
@@ -2542,18 +2525,17 @@ struct bt_config *bt_config_run_from_args(int argc, const char *argv[],
 				goto error;
 			}
 
-			params = bt_private_value_from_arg(arg);
+			params = bt_value_from_arg(arg);
 			if (!params) {
 				printf_err("Invalid format for --params option's argument:\n    %s\n",
 					arg);
 				goto error;
 			}
 
-			params_to_set = bt_value_map_extend(
-				bt_value_borrow_from_private(cur_cfg_comp->params),
-				bt_value_borrow_from_private(params));
-			BT_OBJECT_PUT_REF_AND_RESET(params);
-			if (!params_to_set) {
+			status = bt_value_map_extend(cur_cfg_comp->params,
+				params, &params_to_set);
+			BT_VALUE_PUT_REF_AND_RESET(params);
+			if (status != BT_VALUE_STATUS_OK) {
 				printf_err("Cannot extend current component parameters with --params option's argument:\n    %s\n",
 					arg);
 				goto error;
@@ -2583,7 +2565,7 @@ struct bt_config *bt_config_run_from_args(int argc, const char *argv[],
 				goto error;
 			}
 
-			if (bt_private_value_map_insert_string_entry(cur_cfg_comp->params,
+			if (bt_value_map_insert_string_entry(cur_cfg_comp->params,
 					cur_param_key->str, arg)) {
 				print_err_oom();
 				goto error;
@@ -2600,8 +2582,8 @@ struct bt_config *bt_config_run_from_args(int argc, const char *argv[],
 			break;
 		case OPT_BASE_PARAMS:
 		{
-			struct bt_private_value *params =
-				bt_private_value_from_arg(arg);
+			bt_value *params =
+				bt_value_from_arg(arg);
 
 			if (!params) {
 				printf_err("Invalid format for --base-params option's argument:\n    %s\n",
@@ -2613,15 +2595,15 @@ struct bt_config *bt_config_run_from_args(int argc, const char *argv[],
 			break;
 		}
 		case OPT_RESET_BASE_PARAMS:
-			BT_OBJECT_PUT_REF_AND_RESET(cur_base_params);
-			cur_base_params = bt_private_value_map_create();
+			BT_VALUE_PUT_REF_AND_RESET(cur_base_params);
+			cur_base_params = bt_value_map_create();
 			if (!cur_base_params) {
 				print_err_oom();
 				goto error;
 			}
 			break;
 		case OPT_CONNECT:
-			if (bt_private_value_array_append_string_element(
+			if (bt_value_array_append_string_element(
 					connection_args, arg)) {
 				print_err_oom();
 				goto error;
@@ -2690,7 +2672,7 @@ struct bt_config *bt_config_run_from_args(int argc, const char *argv[],
 	}
 
 	ret = bt_config_cli_args_create_connections(cfg,
-		bt_value_borrow_from_private(connection_args),
+		connection_args,
 		error_buf, 256);
 	if (ret) {
 		printf_err("Cannot creation connections:\n%s", error_buf);
@@ -2714,17 +2696,17 @@ end:
 
 	free(arg);
 	BT_OBJECT_PUT_REF_AND_RESET(cur_cfg_comp);
-	BT_OBJECT_PUT_REF_AND_RESET(cur_base_params);
-	BT_OBJECT_PUT_REF_AND_RESET(instance_names);
-	BT_OBJECT_PUT_REF_AND_RESET(connection_args);
+	BT_VALUE_PUT_REF_AND_RESET(cur_base_params);
+	BT_VALUE_PUT_REF_AND_RESET(instance_names);
+	BT_VALUE_PUT_REF_AND_RESET(connection_args);
 	return cfg;
 }
 
 static
-struct bt_config *bt_config_run_from_args_array(struct bt_value *run_args,
+struct bt_config *bt_config_run_from_args_array(const bt_value *run_args,
 		int *retcode, bool force_omit_system_plugin_path,
 		bool force_omit_home_plugin_path,
-		struct bt_private_value *initial_plugin_paths)
+		const bt_value *initial_plugin_paths)
 {
 	struct bt_config *cfg = NULL;
 	const char **argv;
@@ -2745,14 +2727,13 @@ struct bt_config *bt_config_run_from_args_array(struct bt_value *run_args,
 		goto end;
 	}
 	for (i = 0; i < len; i++) {
-		int ret;
-		struct bt_value *arg_value =
-			bt_value_array_borrow_element_by_index(run_args, i);
+		const bt_value *arg_value =
+			bt_value_array_borrow_element_by_index_const(run_args,
+								     i);
 		const char *arg;
 
 		BT_ASSERT(arg_value);
-		ret = bt_value_string_get(arg_value, &arg);
-		BT_ASSERT(ret == 0);
+		arg = bt_value_string_get(arg_value);
 		BT_ASSERT(arg);
 		argv[i + 1] = arg;
 	}
@@ -2946,7 +2927,7 @@ struct poptOption convert_long_options[] = {
 
 static
 GString *get_component_auto_name(const char *prefix,
-		struct bt_value *existing_names)
+		const bt_value *existing_names)
 {
 	unsigned int i = 0;
 	GString *auto_name = g_string_new(NULL);
@@ -2975,12 +2956,12 @@ struct implicit_component_args {
 	GString *comp_arg;
 	GString *name_arg;
 	GString *params_arg;
-	struct bt_private_value *extra_params;
+	bt_value *extra_params;
 };
 
 static
 int assign_name_to_implicit_component(struct implicit_component_args *args,
-		const char *prefix, struct bt_private_value *existing_names,
+		const char *prefix, bt_value *existing_names,
 		GList **comp_names, bool append_to_comp_names)
 {
 	int ret = 0;
@@ -2991,7 +2972,7 @@ int assign_name_to_implicit_component(struct implicit_component_args *args,
 	}
 
 	name = get_component_auto_name(prefix,
-		bt_value_borrow_from_private(existing_names));
+		existing_names);
 
 	if (!name) {
 		ret = -1;
@@ -3000,7 +2981,7 @@ int assign_name_to_implicit_component(struct implicit_component_args *args,
 
 	g_string_assign(args->name_arg, name->str);
 
-	if (bt_private_value_map_insert_entry(existing_names, name->str,
+	if (bt_value_map_insert_entry(existing_names, name->str,
 			bt_value_null)) {
 		print_err_oom();
 		ret = -1;
@@ -3023,7 +3004,7 @@ end:
 static
 int append_run_args_for_implicit_component(
 		struct implicit_component_args *impl_args,
-		struct bt_private_value *run_args)
+		bt_value *run_args)
 {
 	int ret = 0;
 	size_t i;
@@ -3032,58 +3013,53 @@ int append_run_args_for_implicit_component(
 		goto end;
 	}
 
-	if (bt_private_value_array_append_string_element(run_args, "--component")) {
+	if (bt_value_array_append_string_element(run_args, "--component")) {
 		print_err_oom();
 		goto error;
 	}
 
-	if (bt_private_value_array_append_string_element(run_args, impl_args->comp_arg->str)) {
+	if (bt_value_array_append_string_element(run_args, impl_args->comp_arg->str)) {
 		print_err_oom();
 		goto error;
 	}
 
-	if (bt_private_value_array_append_string_element(run_args, "--name")) {
+	if (bt_value_array_append_string_element(run_args, "--name")) {
 		print_err_oom();
 		goto error;
 	}
 
-	if (bt_private_value_array_append_string_element(run_args, impl_args->name_arg->str)) {
+	if (bt_value_array_append_string_element(run_args, impl_args->name_arg->str)) {
 		print_err_oom();
 		goto error;
 	}
 
 	if (impl_args->params_arg->len > 0) {
-		if (bt_private_value_array_append_string_element(run_args, "--params")) {
+		if (bt_value_array_append_string_element(run_args, "--params")) {
 			print_err_oom();
 			goto error;
 		}
 
-		if (bt_private_value_array_append_string_element(run_args,
+		if (bt_value_array_append_string_element(run_args,
 				impl_args->params_arg->str)) {
 			print_err_oom();
 			goto error;
 		}
 	}
 
-	for (i = 0; i < bt_value_array_get_size(
-			bt_value_borrow_from_private(impl_args->extra_params));
+	for (i = 0; i < bt_value_array_get_size(impl_args->extra_params);
 			i++) {
-		struct bt_value *elem;
+		const bt_value *elem;
 		const char *arg;
 
-		elem = bt_value_array_borrow_element_by_index(
-			bt_value_borrow_from_private(impl_args->extra_params),
-			i);
+		elem = bt_value_array_borrow_element_by_index(impl_args->extra_params,
+							      i);
 		if (!elem) {
 			goto error;
 		}
 
 		BT_ASSERT(bt_value_is_string(elem));
-		if (bt_value_string_get(elem, &arg)) {
-			goto error;
-		}
-
-		ret = bt_private_value_array_append_string_element(run_args, arg);
+		arg = bt_value_string_get(elem);
+		ret = bt_value_array_append_string_element(run_args, arg);
 		if (ret) {
 			print_err_oom();
 			goto error;
@@ -3116,7 +3092,7 @@ void finalize_implicit_component_args(struct implicit_component_args *args)
 		g_string_free(args->params_arg, TRUE);
 	}
 
-	bt_object_put_ref(args->extra_params);
+	bt_value_put_ref(args->extra_params);
 }
 
 static
@@ -3140,7 +3116,7 @@ int init_implicit_component_args(struct implicit_component_args *args,
 	args->comp_arg = g_string_new(comp_arg);
 	args->name_arg = g_string_new(NULL);
 	args->params_arg = g_string_new(NULL);
-	args->extra_params = bt_private_value_array_create();
+	args->extra_params = bt_value_array_create();
 
 	if (!args->comp_arg || !args->name_arg ||
 			!args->params_arg || !args->extra_params) {
@@ -3174,25 +3150,25 @@ int append_implicit_component_extra_param(struct implicit_component_args *args,
 	BT_ASSERT(key);
 	BT_ASSERT(value);
 
-	if (bt_private_value_array_append_string_element(args->extra_params, "--key")) {
+	if (bt_value_array_append_string_element(args->extra_params, "--key")) {
 		print_err_oom();
 		ret = -1;
 		goto end;
 	}
 
-	if (bt_private_value_array_append_string_element(args->extra_params, key)) {
+	if (bt_value_array_append_string_element(args->extra_params, key)) {
 		print_err_oom();
 		ret = -1;
 		goto end;
 	}
 
-	if (bt_private_value_array_append_string_element(args->extra_params, "--value")) {
+	if (bt_value_array_append_string_element(args->extra_params, "--value")) {
 		print_err_oom();
 		ret = -1;
 		goto end;
 	}
 
-	if (bt_private_value_array_append_string_element(args->extra_params, value)) {
+	if (bt_value_array_append_string_element(args->extra_params, value)) {
 		print_err_oom();
 		ret = -1;
 		goto end;
@@ -3205,8 +3181,8 @@ end:
 static
 int convert_append_name_param(enum bt_config_component_dest dest,
 		GString *cur_name, GString *cur_name_prefix,
-		struct bt_private_value *run_args,
-		struct bt_private_value *all_names,
+		bt_value *run_args,
+		bt_value *all_names,
 		GList **source_names, GList **filter_names,
 		GList **sink_names)
 {
@@ -3223,16 +3199,15 @@ int convert_append_name_param(enum bt_config_component_dest dest,
 			 * component.
 			 */
 			name = get_component_auto_name(cur_name_prefix->str,
-				bt_value_borrow_from_private(all_names));
+				all_names);
 			append_name_opt = true;
 		} else {
 			/*
 			 * An explicit name was provided for the user
 			 * component.
 			 */
-			if (bt_value_map_has_entry(
-					bt_value_borrow_from_private(all_names),
-					cur_name->str)) {
+			if (bt_value_map_has_entry(all_names,
+						   cur_name->str)) {
 				printf_err("Duplicate component instance name:\n    %s\n",
 					cur_name->str);
 				goto error;
@@ -3250,7 +3225,7 @@ int convert_append_name_param(enum bt_config_component_dest dest,
 		 * Remember this name globally, for the uniqueness of
 		 * all component names.
 		 */
-		if (bt_private_value_map_insert_entry(all_names, name->str, bt_value_null)) {
+		if (bt_value_map_insert_entry(all_names, name->str, bt_value_null)) {
 			print_err_oom();
 			goto error;
 		}
@@ -3259,12 +3234,12 @@ int convert_append_name_param(enum bt_config_component_dest dest,
 		 * Append the --name option if necessary.
 		 */
 		if (append_name_opt) {
-			if (bt_private_value_array_append_string_element(run_args, "--name")) {
+			if (bt_value_array_append_string_element(run_args, "--name")) {
 				print_err_oom();
 				goto error;
 			}
 
-			if (bt_private_value_array_append_string_element(run_args, name->str)) {
+			if (bt_value_array_append_string_element(run_args, name->str)) {
 				print_err_oom();
 				goto error;
 			}
@@ -3332,7 +3307,7 @@ end:
  * function.
  */
 static
-int append_connect_arg(struct bt_private_value *run_args,
+int append_connect_arg(bt_value *run_args,
 		const char *upstream_name, const char *downstream_name)
 {
 	int ret = 0;
@@ -3346,7 +3321,7 @@ int append_connect_arg(struct bt_private_value *run_args,
 		goto end;
 	}
 
-	ret = bt_private_value_array_append_string_element(run_args, "--connect");
+	ret = bt_value_array_append_string_element(run_args, "--connect");
 	if (ret) {
 		print_err_oom();
 		ret = -1;
@@ -3356,7 +3331,7 @@ int append_connect_arg(struct bt_private_value *run_args,
 	g_string_append(arg, e_upstream_name->str);
 	g_string_append_c(arg, ':');
 	g_string_append(arg, e_downstream_name->str);
-	ret = bt_private_value_array_append_string_element(run_args, arg->str);
+	ret = bt_value_array_append_string_element(run_args, arg->str);
 	if (ret) {
 		print_err_oom();
 		ret = -1;
@@ -3383,7 +3358,7 @@ end:
  * Appends the run command's --connect options for the convert command.
  */
 static
-int convert_auto_connect(struct bt_private_value *run_args,
+int convert_auto_connect(bt_value *run_args,
 		GList *source_names, GList *filter_names,
 		GList *sink_names)
 {
@@ -3543,6 +3518,7 @@ int fill_implicit_ctf_inputs_args(GPtrArray *implicit_ctf_inputs_args,
 {
 	int ret = 0;
 	GList *leftover;
+	enum bt_value_status status;
 
 	for (leftover = leftovers; leftover != NULL;
 			leftover = g_list_next(leftover)) {
@@ -3565,11 +3541,10 @@ int fill_implicit_ctf_inputs_args(GPtrArray *implicit_ctf_inputs_args,
 		 * We need our own copy of the extra parameters because
 		 * this is where the unique path goes.
 		 */
-		BT_OBJECT_PUT_REF_AND_RESET(impl_args->extra_params);
-		impl_args->extra_params =
-			bt_value_copy(bt_value_borrow_from_private(
-				base_implicit_ctf_input_args->extra_params));
-		if (!impl_args->extra_params) {
+		BT_VALUE_PUT_REF_AND_RESET(impl_args->extra_params);
+		status = bt_value_copy(base_implicit_ctf_input_args->extra_params,
+			&impl_args->extra_params);
+		if (status != BT_VALUE_STATUS_OK) {
 			print_err_oom();
 			destroy_implicit_component_args(impl_args);
 			goto error;
@@ -3605,7 +3580,7 @@ static
 struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
 		int *retcode, bool force_omit_system_plugin_path,
 		bool force_omit_home_plugin_path,
-		struct bt_private_value *initial_plugin_paths, char *log_level)
+		const bt_value *initial_plugin_paths, char *log_level)
 {
 	poptContext pc = NULL;
 	char *arg = NULL;
@@ -3624,8 +3599,8 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
 	bool print_run_args = false;
 	bool print_run_args_0 = false;
 	bool print_ctf_metadata = false;
-	struct bt_private_value *run_args = NULL;
-	struct bt_private_value *all_names = NULL;
+	bt_value *run_args = NULL;
+	bt_value *all_names = NULL;
 	GList *source_names = NULL;
 	GList *filter_names = NULL;
 	GList *sink_names = NULL;
@@ -3639,13 +3614,14 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
 	struct implicit_component_args implicit_debug_info_args = { 0 };
 	struct implicit_component_args implicit_muxer_args = { 0 };
 	struct implicit_component_args implicit_trimmer_args = { 0 };
-	struct bt_private_value *plugin_paths =
-		bt_object_get_ref(initial_plugin_paths);
+	bt_value *plugin_paths;
 	char error_buf[256] = { 0 };
 	size_t i;
 	struct bt_common_lttng_live_url_parts lttng_live_url_parts = { 0 };
 	char *output = NULL;
 
+	(void) bt_value_copy(initial_plugin_paths, &plugin_paths);
+
 	*retcode = 0;
 
 	if (argc <= 1) {
@@ -3701,13 +3677,13 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
 		goto error;
 	}
 
-	all_names = bt_private_value_map_create();
+	all_names = bt_value_map_create();
 	if (!all_names) {
 		print_err_oom();
 		goto error;
 	}
 
-	run_args = bt_private_value_array_create();
+	run_args = bt_value_array_create();
 	if (!run_args) {
 		print_err_oom();
 		goto error;
@@ -3804,13 +3780,13 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
 				abort();
 			}
 
-			if (bt_private_value_array_append_string_element(run_args,
+			if (bt_value_array_append_string_element(run_args,
 					"--component")) {
 				print_err_oom();
 				goto error;
 			}
 
-			if (bt_private_value_array_append_string_element(run_args, arg)) {
+			if (bt_value_array_append_string_element(run_args, arg)) {
 				print_err_oom();
 				goto error;
 			}
@@ -3833,13 +3809,13 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
 				goto error;
 			}
 
-			if (bt_private_value_array_append_string_element(run_args,
+			if (bt_value_array_append_string_element(run_args,
 					"--params")) {
 				print_err_oom();
 				goto error;
 			}
 
-			if (bt_private_value_array_append_string_element(run_args, arg)) {
+			if (bt_value_array_append_string_element(run_args, arg)) {
 				print_err_oom();
 				goto error;
 			}
@@ -3851,22 +3827,22 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
 				goto error;
 			}
 
-			if (bt_private_value_array_append_string_element(run_args, "--key")) {
+			if (bt_value_array_append_string_element(run_args, "--key")) {
 				print_err_oom();
 				goto error;
 			}
 
-			if (bt_private_value_array_append_string_element(run_args, "path")) {
+			if (bt_value_array_append_string_element(run_args, "path")) {
 				print_err_oom();
 				goto error;
 			}
 
-			if (bt_private_value_array_append_string_element(run_args, "--value")) {
+			if (bt_value_array_append_string_element(run_args, "--value")) {
 				print_err_oom();
 				goto error;
 			}
 
-			if (bt_private_value_array_append_string_element(run_args, arg)) {
+			if (bt_value_array_append_string_element(run_args, arg)) {
 				print_err_oom();
 				goto error;
 			}
@@ -3878,22 +3854,22 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
 				goto error;
 			}
 
-			if (bt_private_value_array_append_string_element(run_args, "--key")) {
+			if (bt_value_array_append_string_element(run_args, "--key")) {
 				print_err_oom();
 				goto error;
 			}
 
-			if (bt_private_value_array_append_string_element(run_args, "url")) {
+			if (bt_value_array_append_string_element(run_args, "url")) {
 				print_err_oom();
 				goto error;
 			}
 
-			if (bt_private_value_array_append_string_element(run_args, "--value")) {
+			if (bt_value_array_append_string_element(run_args, "--value")) {
 				print_err_oom();
 				goto error;
 			}
 
-			if (bt_private_value_array_append_string_element(run_args, arg)) {
+			if (bt_value_array_append_string_element(run_args, arg)) {
 				print_err_oom();
 				goto error;
 			}
@@ -3905,12 +3881,12 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
 				goto error;
 			}
 
-			if (bt_private_value_array_append_string_element(run_args, "--name")) {
+			if (bt_value_array_append_string_element(run_args, "--name")) {
 				print_err_oom();
 				goto error;
 			}
 
-			if (bt_private_value_array_append_string_element(run_args, arg)) {
+			if (bt_value_array_append_string_element(run_args, arg)) {
 				print_err_oom();
 				goto error;
 			}
@@ -3920,20 +3896,20 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
 		case OPT_OMIT_HOME_PLUGIN_PATH:
 			force_omit_home_plugin_path = true;
 
-			if (bt_private_value_array_append_string_element(run_args,
+			if (bt_value_array_append_string_element(run_args,
 					"--omit-home-plugin-path")) {
 				print_err_oom();
 				goto error;
 			}
 			break;
 		case OPT_RETRY_DURATION:
-			if (bt_private_value_array_append_string_element(run_args,
+			if (bt_value_array_append_string_element(run_args,
 					"--retry-duration")) {
 				print_err_oom();
 				goto error;
 			}
 
-			if (bt_private_value_array_append_string_element(run_args, arg)) {
+			if (bt_value_array_append_string_element(run_args, arg)) {
 				print_err_oom();
 				goto error;
 			}
@@ -3941,7 +3917,7 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
 		case OPT_OMIT_SYSTEM_PLUGIN_PATH:
 			force_omit_system_plugin_path = true;
 
-			if (bt_private_value_array_append_string_element(run_args,
+			if (bt_value_array_append_string_element(run_args,
 					"--omit-system-plugin-path")) {
 				print_err_oom();
 				goto error;
@@ -3953,13 +3929,13 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
 				goto error;
 			}
 
-			if (bt_private_value_array_append_string_element(run_args,
+			if (bt_value_array_append_string_element(run_args,
 					"--plugin-path")) {
 				print_err_oom();
 				goto error;
 			}
 
-			if (bt_private_value_array_append_string_element(run_args, arg)) {
+			if (bt_value_array_append_string_element(run_args, arg)) {
 				print_err_oom();
 				goto error;
 			}
@@ -4178,7 +4154,7 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
 			break;
 		case OPT_FIELDS:
 		{
-			struct bt_private_value *fields = fields_from_arg(arg);
+			bt_value *fields = fields_from_arg(arg);
 
 			if (!fields) {
 				goto error;
@@ -4187,8 +4163,8 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
 			implicit_text_args.exists = true;
 			ret = insert_flat_params_from_array(
 				implicit_text_args.params_arg,
-				bt_value_borrow_from_private(fields), "field");
-			bt_object_put_ref(fields);
+				fields, "field");
+			bt_value_put_ref(fields);
 			if (ret) {
 				goto error;
 			}
@@ -4196,7 +4172,7 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
 		}
 		case OPT_NAMES:
 		{
-			struct bt_private_value *names = names_from_arg(arg);
+			bt_value *names = names_from_arg(arg);
 
 			if (!names) {
 				goto error;
@@ -4205,8 +4181,8 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
 			implicit_text_args.exists = true;
 			ret = insert_flat_params_from_array(
 				implicit_text_args.params_arg,
-				bt_value_borrow_from_private(names), "name");
-			bt_object_put_ref(names);
+				names, "name");
+			bt_value_put_ref(names);
 			if (ret) {
 				goto error;
 			}
@@ -4695,19 +4671,16 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
 			goto error;
 		}
 
-		for (i = 0; i < bt_value_array_get_size(
-				bt_value_borrow_from_private(run_args)); i++) {
-			struct bt_value *arg_value =
-				bt_value_array_borrow_element_by_index(
-					bt_value_borrow_from_private(run_args),
-					i);
+		for (i = 0; i < bt_value_array_get_size(run_args); i++) {
+			const bt_value *arg_value =
+				bt_value_array_borrow_element_by_index(run_args,
+								       i);
 			const char *arg;
 			GString *quoted = NULL;
 			const char *arg_to_print;
 
 			BT_ASSERT(arg_value);
-			ret = bt_value_string_get(arg_value, &arg);
-			BT_ASSERT(ret == 0);
+			arg = bt_value_string_get(arg_value);
 
 			if (print_run_args) {
 				quoted = bt_common_shell_quote(arg, true);
@@ -4726,8 +4699,7 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
 				g_string_free(quoted, TRUE);
 			}
 
-			if (i < bt_value_array_get_size(
-					bt_value_borrow_from_private(run_args)) - 1) {
+			if (i < bt_value_array_get_size(run_args) - 1) {
 				if (print_run_args) {
 					putchar(' ');
 				} else {
@@ -4741,10 +4713,10 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
 		goto end;
 	}
 
-	cfg = bt_config_run_from_args_array(
-		bt_value_borrow_from_private(run_args), retcode,
-		force_omit_system_plugin_path, force_omit_home_plugin_path,
-		initial_plugin_paths);
+	cfg = bt_config_run_from_args_array(run_args, retcode,
+					    force_omit_system_plugin_path,
+					    force_omit_home_plugin_path,
+					    initial_plugin_paths);
 	if (!cfg) {
 		goto error;
 	}
@@ -4776,8 +4748,8 @@ end:
 		g_ptr_array_free(implicit_ctf_inputs_args, TRUE);
 	}
 
-	bt_object_put_ref(run_args);
-	bt_object_put_ref(all_names);
+	bt_value_put_ref(run_args);
+	bt_value_put_ref(all_names);
 	destroy_glist_of_gstring(source_names);
 	destroy_glist_of_gstring(filter_names);
 	destroy_glist_of_gstring(sink_names);
@@ -4790,7 +4762,7 @@ end:
 	finalize_implicit_component_args(&implicit_debug_info_args);
 	finalize_implicit_component_args(&implicit_muxer_args);
 	finalize_implicit_component_args(&implicit_trimmer_args);
-	bt_object_put_ref(plugin_paths);
+	bt_value_put_ref(plugin_paths);
 	bt_common_destroy_lttng_live_url_parts(&lttng_live_url_parts);
 	return cfg;
 }
@@ -4858,7 +4830,7 @@ char log_level_from_arg(const char *arg)
 struct bt_config *bt_config_cli_args_create(int argc, const char *argv[],
 		int *retcode, bool force_omit_system_plugin_path,
 		bool force_omit_home_plugin_path,
-		struct bt_private_value *initial_plugin_paths)
+		const bt_value *initial_plugin_paths)
 {
 	struct bt_config *config = NULL;
 	int i;
@@ -4879,13 +4851,13 @@ struct bt_config *bt_config_cli_args_create(int argc, const char *argv[],
 	*retcode = -1;
 
 	if (!initial_plugin_paths) {
-		initial_plugin_paths = bt_private_value_array_create();
+		initial_plugin_paths = bt_value_array_create();
 		if (!initial_plugin_paths) {
 			*retcode = 1;
 			goto end;
 		}
 	} else {
-		bt_object_get_ref(initial_plugin_paths);
+		bt_value_get_ref(initial_plugin_paths);
 	}
 
 	if (argc <= 1) {
@@ -5047,6 +5019,6 @@ struct bt_config *bt_config_cli_args_create(int argc, const char *argv[],
 	}
 
 end:
-	bt_object_put_ref(initial_plugin_paths);
+	bt_value_put_ref(initial_plugin_paths);
 	return config;
 }