diff options
| author | Peter Maydell | 2018-02-16 19:39:04 +0100 |
|---|---|---|
| committer | Peter Maydell | 2018-02-16 19:39:05 +0100 |
| commit | e5ecc287a7bd24a1364e23e263cb60cfc8d21eb5 (patch) | |
| tree | 3d11462bff19284f56a9237c7cec9a583a5f9f76 /monitor.c | |
| parent | cuda.h: Fix multiple typedef (diff) | |
| parent | monitor.c: Fix infinite loop in monitor's auto-complete (diff) | |
| download | qemu-e5ecc287a7bd24a1364e23e263cb60cfc8d21eb5.tar.gz qemu-e5ecc287a7bd24a1364e23e263cb60cfc8d21eb5.tar.xz qemu-e5ecc287a7bd24a1364e23e263cb60cfc8d21eb5.zip | |
Merge remote-tracking branch 'remotes/dgilbert/tags/pull-hmp-20180216' into staging
HMP pull 2018-02-16
# gpg: Signature made Fri 16 Feb 2018 17:45:06 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-20180216:
monitor.c: Fix infinite loop in monitor's auto-complete
monitor: Remove legacy "-mon default=on" parameter
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'monitor.c')
| -rw-r--r-- | monitor.c | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -3696,7 +3696,7 @@ static void monitor_find_completion_by_table(Monitor *mon, { const char *cmdname; int i; - const char *ptype, *str, *name; + const char *ptype, *old_ptype, *str, *name; const mon_cmd_t *cmd; BlockBackend *blk = NULL; @@ -3741,7 +3741,9 @@ static void monitor_find_completion_by_table(Monitor *mon, } } str = args[nb_args - 1]; - while (*ptype == '-' && ptype[1] != '\0') { + old_ptype = NULL; + while (*ptype == '-' && old_ptype != ptype) { + old_ptype = ptype; ptype = next_arg_type(ptype); } switch(*ptype) { @@ -4143,9 +4145,6 @@ QemuOptsList qemu_mon_opts = { .name = "chardev", .type = QEMU_OPT_STRING, },{ - .name = "default", /* deprecated */ - .type = QEMU_OPT_BOOL, - },{ .name = "pretty", .type = QEMU_OPT_BOOL, }, |