Skip to content

Commit

Permalink
Merge remote-tracking branch 'remotes/dgilbert/tags/pull-hmp-20180320…
Browse files Browse the repository at this point in the history
…' 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>
  • Loading branch information
pm215 committed Mar 20, 2018
2 parents ed627b2 + 9537218 commit a9b47e5
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion hmp.c
Expand Up @@ -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) {
Expand Down
2 changes: 2 additions & 0 deletions target/i386/monitor.c
Expand Up @@ -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)
Expand Down

0 comments on commit a9b47e5

Please sign in to comment.