OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

HMP pull 2019-07-15

Browse Source 
Just Christophe's build fix
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEERfXHG0oMt/uXep+pBRYzHrxb/ecFAl0sX/IACgkQBRYzHrxb
 /efs7A/7BLMGbHOoOqE4iNwJ3NySr4lVHaJjUiauLVESqfqKVqpJD01T0bgFrkTT
 yU1FuU3c7Pixohvl1kIlH62AdWTuHXJGqo1BCOoOw7OlVtBDr7feHOkk3kL8O9W9
 LJKovjIEibkilAs+Hx/PvlPb7VypNZ4SgkizRjPqIwdiCR1hfg/WUFFCgPupHnzF
 h9L5qzL8VOYLJEcYdbTZdi8t5yczbmdrU4wNlYZIpptAWdU820hPsekUTuAuIzSi
 zhZMpzZY6QAagYidOI0yhT8z1pTIRz0mgqHY9WtHCN6193TYzcDaNlb7aVSPv9iJ
 pdg50tmmbQJJB20zxp9Pzg8s7XmH5mv3YrnVhV2uyyIJa5pRouwlwy+OPBvN7vKD
 wj/JwkMJcTtuEOC356mj6akMJTzOyG1/oWJAYhrT7VM2zq3jbRfQEaGLnAIs8AAR
 fAyH0K6XSGNrnsmLcXScID33xw9FgJSelXm2o0fGFg0nGmkpcmijZhtff1N2AmBu
 K4Wl2cudhkh48gr6D/mL1V+TezDPCLkWGTJSxTh8YOYMj1jn/oDv1ebNoHWecB0n
 zO27VaF1NjTVevcoSIhzPvRdBalRAJYKwbFwjxtzLW6AM3cxlEzwY7h/Saxu4uQM
 XIm9S6Jl9xn9Z3YYdG42LhBOt8QxmyBcEm3zDgJPIx4GGXqwHgo=
 =IHPx
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/dgilbert/tags/pull-hmp-20190715' into staging

HMP pull 2019-07-15

Just Christophe's build fix

# gpg: Signature made Mon 15 Jul 2019 12:13:54 BST
# gpg:                using RSA key 45F5C71B4A0CB7FB977A9FA90516331EBC5BFDE7
# gpg: Good signature from "Dr. David Alan Gilbert (RH2) <dgilbert@redhat.com>" [full]
# Primary key fingerprint: 45F5 C71B 4A0C B7FB 977A  9FA9 0516 331E BC5B FDE7

* remotes/dgilbert/tags/pull-hmp-20190715:
  Fix build error when VNC is configured out

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2019-07-15 12:22:07 +01:00
commit b9404bf592
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
monitor/hmp-cmds.c
View File

@ -1962,7 +1962,6 @@ static void hmp_change_read_arg(void *opaque, const char *password,
void hmp_change(Monitor *mon, const QDict *qdict)
{
MonitorHMP *hmp_mon = container_of(mon, MonitorHMP, common);
const char *device = qdict_get_str(qdict, "device");
const char *target = qdict_get_str(qdict, "target");
const char *arg = qdict_get_try_str(qdict, "arg");
@ -1980,6 +1979,7 @@ void hmp_change(Monitor *mon, const QDict *qdict)
if (strcmp(target, "passwd") == 0 ||
strcmp(target, "password") == 0) {
if (!arg) {
MonitorHMP *hmp_mon = container_of(mon, MonitorHMP, common);
monitor_read_password(hmp_mon, hmp_change_read_arg, NULL);
return;
}