david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HMP pull 2018-02-16

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQIcBAABAgAGBQJahxiiAAoJEAUWMx68W/3nGr8P/iowKSMEy/4ZyKlAU0q6S33v
 oxLNXWoUUMGnMMs9N18vbQtLKQQFuWrfxkLR6mNRdr6sgjpRF45l+JPtdXukM7x0
 rgRQUSWDb3jW1ETw/FwPv1N5s2cPBAh8/kJFzk9dxVW55flg5s4n6fJHIa6sZlgw
 Pz8qutHJ6SOZdtZLG4q/+vYR0se8W6sTfBW0ExPUvLwlczBT+NcySdkzYsveM0zs
 f70do5BNeQ/yzVMmPPdojzDAKvbOv2tXDfi5G10Z1drUUkiaKy3xAuvVnAXNuqta
 UlhnujtNyejVKdBqIb7XKYv3yWCuP3HQ36QwZNTxGgo4EovNr6W7RP5aUbLavjNQ
 FEZxt+r7XskuIVCDBdPuAdpSIjefNQlNZ6Hft8A+ezS2T7BqnOnkkMNrNxh8aQ6H
 UNRj6YiAveGUeYxGsZTEhBhmceAFPiy8L/B1kINJMhgBesjUi0aiPFz8rFTaBz7G
 bJM4rSOVC4yDYyJkQT/zItqBMIZq+z/mfn0gxtcLKg988AKthTBEhxTl7Y5NQUW4
 zzfPuI9zNb9Al8FSyg+a4MFf6euY9HAwlM6zakNDOZvbR3LcG+qVfbNnOwq4xRTE
 Qtmt7VJiteJX4zN+GqpZLPFS5jbDNmF4/5pMrMJnPxImXsI6wlRc9scYj9SYd/1b
 K9bPU3EdVscNpdV5CnjF
 =C+G1
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Peter Maydell 2018-02-16 18:39:04 +00:00
commit e5ecc287a7
3 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
monitor.c
View File

@ -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) {
@ -4142,9 +4144,6 @@ QemuOptsList qemu_mon_opts = {
},{
.name = "chardev",
.type = QEMU_OPT_STRING,
},{
.name = "default", /* deprecated */
.type = QEMU_OPT_BOOL,
},{
.name = "pretty",
.type = QEMU_OPT_BOOL,

9
qemu-doc.texi
View File

@ -2628,15 +2628,6 @@ setting ``-machine kernel_irqchip=off''.
The ``-no-kvm'' argument is now a synonym for setting
``-machine accel=tcg''.
@subsection -mon default=on (since 2.4.0)
The ``default'' option to the ``-mon'' argument is
now ignored. When multiple monitors were enabled, it
indicated which monitor would receive log messages
from the various subsystems. This feature is no longer
required as messages are now only sent to the monitor
in response to explicitly monitor commands.
@subsection -vnc tls (since 2.5.0)
The ``-vnc tls'' argument is now a synonym for setting

4
vl.c
View File

@ -2423,10 +2423,6 @@ static int mon_init_func(void *opaque, QemuOpts *opts, Error **errp)
if (qemu_opt_get_bool(opts, "pretty", 0))
flags |= MONITOR_USE_PRETTY;
if (qemu_opt_get_bool(opts, "default", 0)) {
error_report("option 'default' does nothing and is deprecated");
}
chardev = qemu_opt_get(opts, "chardev");
chr = qemu_chr_find(chardev);
if (chr == NULL) {