summary refs log tree commit diff stats
path: root/vl.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2018-02-16 18:39:04 +0000
committerPeter Maydell <peter.maydell@linaro.org>2018-02-16 18:39:05 +0000
commite5ecc287a7bd24a1364e23e263cb60cfc8d21eb5 (patch)
tree3d11462bff19284f56a9237c7cec9a583a5f9f76 /vl.c
parentf0fa81767555fe2c4b5f8c9e0725a80eac1d7f56 (diff)
parentbf67f1c0b16c0de43b8a10cb53808dd62b0cdc04 (diff)
downloadfocaccia-qemu-e5ecc287a7bd24a1364e23e263cb60cfc8d21eb5.tar.gz
focaccia-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 'vl.c')
-rw-r--r--vl.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/vl.c b/vl.c
index 7a5554bc41..81724f5f17 100644
--- a/vl.c
+++ b/vl.c
@@ -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) {