Commit a9b47e53 authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents ed627b2a 95372184

hmp.c

+1 −1
Original line number Diff line number Diff line
@@ -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) {

target/i386/monitor.c

+2 −0
Original line number Diff line number Diff line
@@ -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)