From e96e5ae880f0e5d4d372264e2a5cb91cba40f771 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Thu, 6 Mar 2014 10:39:24 +0100 Subject: qemu-option: introduce qemu_find_opts_singleton Reviewed-by: Laszlo Ersek Reviewed-by: Andreas Färber Signed-off-by: Paolo Bonzini Signed-off-by: Igor Mammedov Signed-off-by: Michael Tokarev --- util/qemu-config.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'util') diff --git a/util/qemu-config.c b/util/qemu-config.c index f6101012c0..60051dfed4 100644 --- a/util/qemu-config.c +++ b/util/qemu-config.c @@ -39,6 +39,20 @@ QemuOptsList *qemu_find_opts(const char *group) return ret; } +QemuOpts *qemu_find_opts_singleton(const char *group) +{ + QemuOptsList *list; + QemuOpts *opts; + + list = qemu_find_opts(group); + assert(list); + opts = qemu_opts_find(list, NULL); + if (!opts) { + opts = qemu_opts_create(list, NULL, 0, &error_abort); + } + return opts; +} + static CommandLineParameterInfoList *query_option_descs(const QemuOptDesc *desc) { CommandLineParameterInfoList *param_list = NULL, *entry; -- cgit v1.2.3-55-g7522 From 00a9cacaea9afa4cb72871d1067bb21f75dcc3bd Mon Sep 17 00:00:00 2001 From: Kirill Batuzov Date: Thu, 10 Apr 2014 18:07:57 +0400 Subject: init_paths: fix minor memory leak Fields "name" (created with strdup in new_entry) and "pathname" (created with g_strdup_printf in new_entry) of pathelem struct should be freed before the whole struct is. Signed-off-by: Kirill Batuzov Signed-off-by: Michael Tokarev --- util/path.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'util') diff --git a/util/path.c b/util/path.c index 623219e4c5..5c59d9f1d3 100644 --- a/util/path.c +++ b/util/path.c @@ -160,7 +160,9 @@ void init_paths(const char *prefix) base = new_entry("", NULL, pref_buf); base = add_dir_maybe(base); if (base->num_entries == 0) { - free (base); + g_free(base->pathname); + free(base->name); + free(base); base = NULL; } else { set_parents(base, base); -- cgit v1.2.3-55-g7522