[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULLv2 04/25] qga: free remaining leaking state
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PULLv2 04/25] qga: free remaining leaking state |
Date: |
Thu, 8 Sep 2016 18:16:59 +0400 |
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
qga/guest-agent-command-state.c | 6 ++++++
qga/main.c | 6 ++++++
qga/guest-agent-core.h | 1 +
3 files changed, 13 insertions(+)
diff --git a/qga/guest-agent-command-state.c b/qga/guest-agent-command-state.c
index 4de229c..e609d32 100644
--- a/qga/guest-agent-command-state.c
+++ b/qga/guest-agent-command-state.c
@@ -71,3 +71,9 @@ GACommandState *ga_command_state_new(void)
cs->groups = NULL;
return cs;
}
+
+void ga_command_state_free(GACommandState *cs)
+{
+ g_slist_free_full(cs->groups, g_free);
+ g_free(cs);
+}
diff --git a/qga/main.c b/qga/main.c
index bb48214..0b9d04e 100644
--- a/qga/main.c
+++ b/qga/main.c
@@ -1371,6 +1371,8 @@ int main(int argc, char **argv)
end:
if (s->command_state) {
ga_command_state_cleanup_all(s->command_state);
+ ga_command_state_free(s->command_state);
+ json_message_parser_destroy(&s->parser);
}
if (s->channel) {
ga_channel_free(s->channel);
@@ -1383,6 +1385,10 @@ end:
}
config_free(config);
+ if (s->main_loop) {
+ g_main_loop_unref(s->main_loop);
+ }
+ g_free(s);
return ret;
}
diff --git a/qga/guest-agent-core.h b/qga/guest-agent-core.h
index 0a49516..63e9d39 100644
--- a/qga/guest-agent-core.h
+++ b/qga/guest-agent-core.h
@@ -28,6 +28,7 @@ void ga_command_state_add(GACommandState *cs,
void ga_command_state_init_all(GACommandState *cs);
void ga_command_state_cleanup_all(GACommandState *cs);
GACommandState *ga_command_state_new(void);
+void ga_command_state_free(GACommandState *cs);
bool ga_logging_enabled(GAState *s);
void ga_disable_logging(GAState *s);
void ga_enable_logging(GAState *s);
--
2.10.0
- [Qemu-devel] [PULLv2 00/25] Leak patches, Marc-André Lureau, 2016/09/08
- [Qemu-devel] [PULLv2 01/25] tests: fix test-qga leaks, Marc-André Lureau, 2016/09/08
- [Qemu-devel] [PULLv2 02/25] glib-compat: add g_(s)list_free_full(), Marc-André Lureau, 2016/09/08
- [Qemu-devel] [PULLv2 04/25] qga: free remaining leaking state,
Marc-André Lureau <=
- [Qemu-devel] [PULLv2 03/25] qga: free the whole blacklist, Marc-André Lureau, 2016/09/08
- [Qemu-devel] [PULLv2 05/25] tests: fix test-cutils leaks, Marc-André Lureau, 2016/09/08
- [Qemu-devel] [PULLv2 07/25] tests: fix test-iov leaks, Marc-André Lureau, 2016/09/08
- [Qemu-devel] [PULLv2 08/25] tests: fix check-qom-interface leaks, Marc-André Lureau, 2016/09/08
- [Qemu-devel] [PULLv2 06/25] tests: fix test-vmstate leaks, Marc-André Lureau, 2016/09/08
- [Qemu-devel] [PULLv2 10/25] tests: fix leak in test-string-input-visitor, Marc-André Lureau, 2016/09/08
- [Qemu-devel] [PULLv2 09/25] tests: fix check-qom-proplist leaks, Marc-André Lureau, 2016/09/08
- [Qemu-devel] [PULLv2 11/25] portio: keep references on portio, Marc-André Lureau, 2016/09/08
- [Qemu-devel] [PULLv2 12/25] pc: simplify passing qemu_irq, Marc-André Lureau, 2016/09/08
- [Qemu-devel] [PULLv2 13/25] pc: don't leak a20_line, Marc-André Lureau, 2016/09/08