[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 1/9] migration: fix vmdesc leak on vmstate_save() error
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[PULL 1/9] migration: fix vmdesc leak on vmstate_save() error |
Date: |
Wed, 25 Sep 2019 16:01:22 +0100 |
From: Marc-André Lureau <address@hidden>
Signed-off-by: Marc-André Lureau <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Daniel P. Berrangé <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
---
migration/qjson.h | 2 ++
migration/savevm.c | 3 +--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/migration/qjson.h b/migration/qjson.h
index 41664f2d71..1786bb5864 100644
--- a/migration/qjson.h
+++ b/migration/qjson.h
@@ -24,4 +24,6 @@ void json_start_object(QJSON *json, const char *name);
const char *qjson_get_str(QJSON *json);
void qjson_finish(QJSON *json);
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(QJSON, qjson_destroy)
+
#endif /* QEMU_QJSON_H */
diff --git a/migration/savevm.c b/migration/savevm.c
index ee06f91d42..bb9462a54d 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -1314,7 +1314,7 @@ int
qemu_savevm_state_complete_precopy_non_iterable(QEMUFile *f,
bool in_postcopy,
bool inactivate_disks)
{
- QJSON *vmdesc;
+ g_autoptr(QJSON) vmdesc = NULL;
int vmdesc_len;
SaveStateEntry *se;
int ret;
@@ -1375,7 +1375,6 @@ int
qemu_savevm_state_complete_precopy_non_iterable(QEMUFile *f,
qemu_put_be32(f, vmdesc_len);
qemu_put_buffer(f, (uint8_t *)qjson_get_str(vmdesc), vmdesc_len);
}
- qjson_destroy(vmdesc);
return 0;
}
--
2.21.0
- [PULL 0/9] migration queue, Dr. David Alan Gilbert (git), 2019/09/25
- [PULL 1/9] migration: fix vmdesc leak on vmstate_save() error,
Dr. David Alan Gilbert (git) <=
- [PULL 2/9] migration/postcopy: not necessary to do discard when canonicalizing bitmap, Dr. David Alan Gilbert (git), 2019/09/25
- [PULL 3/9] migration/postcopy: unsentmap is not necessary for postcopy, Dr. David Alan Gilbert (git), 2019/09/25
- [PULL 4/9] migration: remove sent parameter in get_queued_page_not_dirty, Dr. David Alan Gilbert (git), 2019/09/25
- [PULL 5/9] migration/rdma: Don't moan about disconnects at the end, Dr. David Alan Gilbert (git), 2019/09/25
- [PULL 6/9] migration/rdma.c: Swap synchronize_rcu for call_rcu, Dr. David Alan Gilbert (git), 2019/09/25
- [PULL 7/9] tests/migration: Fail on unexpected migration states, Dr. David Alan Gilbert (git), 2019/09/25
- [PULL 8/9] tests/migration/postcopy: trim migration bandwidth, Dr. David Alan Gilbert (git), 2019/09/25
- [PULL 9/9] migration/postcopy: Recognise the recovery states as 'in_postcopy', Dr. David Alan Gilbert (git), 2019/09/25
- Re: [PULL 0/9] migration queue, Peter Maydell, 2019/09/26