diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-03-20 18:03:10 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-03-20 18:03:10 +0000 |
| commit | a9b47e53e88f3816e041e00c08714e451251e498 (patch) | |
| tree | fc782e16c7f4003f7a2346bf76c02c64285276ae | |
| parent | ed627b2ad37469eeba9e9ed5fecfe315df9ecc60 (diff) | |
| parent | 95372184b7acdfd82ee748b6f0c6df1d839982ba (diff) | |
| download | qemu-a9b47e53e88f3816e041e00c08714e451251e498.tar.gz | |
Merge remote-tracking branch 'remotes/dgilbert/tags/pull-hmp-20180320' into staging
HMP fixes for 2.12
# gpg: Signature made Tue 20 Mar 2018 12:39:24 GMT
# gpg: using RSA key 0516331EBC5BFDE7
# gpg: Good signature from "Dr. David Alan Gilbert (RH2) <dgilbert@redhat.com>"
# Primary key fingerprint: 45F5 C71B 4A0C B7FB 977A 9FA9 0516 331E BC5B FDE7
* remotes/dgilbert/tags/pull-hmp-20180320:
hmp: free sev info
HMP: Initialize err before using
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | hmp.c | 2 | ||||
| -rw-r--r-- | target/i386/monitor.c | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -1321,7 +1321,7 @@ void hmp_savevm(Monitor *mon, const QDict *qdict) void hmp_delvm(Monitor *mon, const QDict *qdict) { BlockDriverState *bs; - Error *err; + Error *err = NULL; const char *name = qdict_get_str(qdict, "name"); if (bdrv_all_delete_snapshot(name, &bs, &err) < 0) { diff --git a/target/i386/monitor.c b/target/i386/monitor.c index 011419eba2..a890b3c2ab 100644 --- a/target/i386/monitor.c +++ b/target/i386/monitor.c @@ -696,6 +696,8 @@ void hmp_info_sev(Monitor *mon, const QDict *qdict) } else { monitor_printf(mon, "SEV is not enabled\n"); } + + qapi_free_SevInfo(info); } SevLaunchMeasureInfo *qmp_query_sev_launch_measure(Error **errp) |