openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

HMP fixes for 2.12 

-----BEGIN PGP SIGNATURE-----
 
 iQIcBAABAgAGBQJasQD8AAoJEAUWMx68W/3ntJUP/RyyKtDsfnnVEw0L5qjPCiTW
 vzueYqXKQm5YCLW5JylTnx+QuQN5gYux2ivlvSg6f4ZG+XwY+0oQFcOxMqqoJJVj
 UE2rqwVKeUyA5DZfffP0sbNMZUko2LOZg7ljG5QShmr6Qe6ECaTZddGLOwjfpL/Y
 tk3xHvyIqyPJ4Vhlk/yTAKCCjd/Ybd5+3m1mPy64YpzNWvEPkCtl3yfWCkZglgWA
 v34itEXPM4f/hXKoiAbuPmdi6Z3yRsUbTocdb/R7AIq27fl+1udl5qmCJnWCDEXt
 eTu1lqUrLqrWWDcbnd+GiN6ziLHx8y02eIYPmmX2Ngna9pkDiJEb5N8nkG+dLPyL
 LTHhgJlg+5g39n09VquhYv+i2ji07Su6OC42Hs812MwahsDuR169AM4eyoFFty0W
 vXidsb7oJNJe7QLbHcYR70Hn2py5sD450FhRBmWNhFqmFrP9/pdcMG5eaXWZp4i6
 ON0KFquB57W4QnqpD0bX2qGpPXLS3VZEel9gZI/CkIOp5fc1SOqLW0pELhZYAouq
 NUvdND90fKOObdKQeItryfzaOp10/4kuPHID38kkeDBJwXalN0CPN27kaGFhI3c+
 mGJYswWjPqj94dQOS2lFMllxXASfRnubj6RFSNPcDx5H/j5I/eLroGkeNcW5NTik
 CD6gE21EfXpubFScvYWU
 =62yR
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Peter Maydell 2018-03-20 18:03:10 +00:00
parent ed627b2ad3 95372184b7
commit a9b47e53e8
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hmp.c
View File

@ -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) {

2
target/i386/monitor.c
View File

@ -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)