qemu with hax to log dma reads & writes jcs.org/2018/11/12/vfio

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>

+4 -18
+4 -5
monitor.c
··· 3696 3696 { 3697 3697 const char *cmdname; 3698 3698 int i; 3699 - const char *ptype, *str, *name; 3699 + const char *ptype, *old_ptype, *str, *name; 3700 3700 const mon_cmd_t *cmd; 3701 3701 BlockBackend *blk = NULL; 3702 3702 ··· 3741 3741 } 3742 3742 } 3743 3743 str = args[nb_args - 1]; 3744 - while (*ptype == '-' && ptype[1] != '\0') { 3744 + old_ptype = NULL; 3745 + while (*ptype == '-' && old_ptype != ptype) { 3746 + old_ptype = ptype; 3745 3747 ptype = next_arg_type(ptype); 3746 3748 } 3747 3749 switch(*ptype) { ··· 4142 4144 },{ 4143 4145 .name = "chardev", 4144 4146 .type = QEMU_OPT_STRING, 4145 - },{ 4146 - .name = "default", /* deprecated */ 4147 - .type = QEMU_OPT_BOOL, 4148 4147 },{ 4149 4148 .name = "pretty", 4150 4149 .type = QEMU_OPT_BOOL,
-9
qemu-doc.texi
··· 2628 2628 The ``-no-kvm'' argument is now a synonym for setting 2629 2629 ``-machine accel=tcg''. 2630 2630 2631 - @subsection -mon default=on (since 2.4.0) 2632 - 2633 - The ``default'' option to the ``-mon'' argument is 2634 - now ignored. When multiple monitors were enabled, it 2635 - indicated which monitor would receive log messages 2636 - from the various subsystems. This feature is no longer 2637 - required as messages are now only sent to the monitor 2638 - in response to explicitly monitor commands. 2639 - 2640 2631 @subsection -vnc tls (since 2.5.0) 2641 2632 2642 2633 The ``-vnc tls'' argument is now a synonym for setting
-4
vl.c
··· 2423 2423 if (qemu_opt_get_bool(opts, "pretty", 0)) 2424 2424 flags |= MONITOR_USE_PRETTY; 2425 2425 2426 - if (qemu_opt_get_bool(opts, "default", 0)) { 2427 - error_report("option 'default' does nothing and is deprecated"); 2428 - } 2429 - 2430 2426 chardev = qemu_opt_get(opts, "chardev"); 2431 2427 chr = qemu_chr_find(chardev); 2432 2428 if (chr == NULL) {