aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@redhat.com>2016-07-15 18:17:41 +0200
committerMarc-André Lureau <marcandre.lureau@redhat.com>2016-09-08 17:57:32 +0400
commit2aa67a919680ed62bbfc77fffbda2ab2e9490d03 (patch)
tree80f495a83e8181db2541a1fa7a56ef9a03693cbd
parent5c7e3e9fb1d7fd3f542fce83ef1d911196d48e11 (diff)
downloadqemu-2aa67a919680ed62bbfc77fffbda2ab2e9490d03.zip
qemu-2aa67a919680ed62bbfc77fffbda2ab2e9490d03.tar.gz
qemu-2aa67a919680ed62bbfc77fffbda2ab2e9490d03.tar.bz2
qga: free the whole blacklist
Free the config blacklist list, not just the elements. Do it so in the more appropriate function config_free(). Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com>
-rw-r--r--qga/main.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/qga/main.c b/qga/main.c
index 4c3b2c7..bb48214 100644
--- a/qga/main.c
+++ b/qga/main.c
@@ -1175,6 +1175,7 @@ static void config_free(GAConfig *config)
#ifdef CONFIG_FSFREEZE
g_free(config->fsfreeze_hook);
#endif
+ g_list_free_full(config->blacklist, g_free);
g_free(config);
}
@@ -1310,11 +1311,6 @@ static int run_agent(GAState *s, GAConfig *config)
return EXIT_SUCCESS;
}
-static void free_blacklist_entry(gpointer entry, gpointer unused)
-{
- g_free(entry);
-}
-
int main(int argc, char **argv)
{
int ret = EXIT_SUCCESS;
@@ -1379,7 +1375,6 @@ end:
if (s->channel) {
ga_channel_free(s->channel);
}
- g_list_foreach(config->blacklist, free_blacklist_entry, NULL);
g_free(s->pstate_filepath);
g_free(s->state_filepath_isfrozen);