[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PULL 20/23] monitor: deprecate 'default' option
From: |
Michael Tokarev |
Subject: |
[Qemu-trivial] [PULL 20/23] monitor: deprecate 'default' option |
Date: |
Fri, 28 Oct 2016 18:18:51 +0300 |
From: Marc-André Lureau <address@hidden>
This option does nothing since commit 06ac27f. Deprecate it.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
include/monitor/monitor.h | 2 +-
monitor.c | 2 +-
qemu-options.hx | 8 ++++----
vl.c | 11 +++--------
4 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h
index a714d8e..8cc532e 100644
--- a/include/monitor/monitor.h
+++ b/include/monitor/monitor.h
@@ -9,7 +9,7 @@
extern Monitor *cur_mon;
/* flags for monitor_init */
-#define MONITOR_IS_DEFAULT 0x01
+/* 0x01 unused */
#define MONITOR_USE_READLINE 0x02
#define MONITOR_USE_CONTROL 0x04
#define MONITOR_USE_PRETTY 0x08
diff --git a/monitor.c b/monitor.c
index 21dcfb2..c4b6e26 100644
--- a/monitor.c
+++ b/monitor.c
@@ -4094,7 +4094,7 @@ QemuOptsList qemu_mon_opts = {
.name = "chardev",
.type = QEMU_OPT_STRING,
},{
- .name = "default",
+ .name = "default", /* deprecated */
.type = QEMU_OPT_BOOL,
},{
.name = "pretty",
diff --git a/qemu-options.hx b/qemu-options.hx
index f296406..95332cc 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -2239,7 +2239,7 @@ two serial ports and the QEMU monitor:
@example
-chardev stdio,mux=on,id=char0 \
--mon chardev=char0,mode=readline,default \
+-mon chardev=char0,mode=readline \
-serial chardev:char0 \
-serial chardev:char0
@end example
@@ -2250,7 +2250,7 @@ multiplexed between the QEMU monitor and a parallel port:
@example
-chardev stdio,mux=on,id=char0 \
--mon chardev=char0,mode=readline,default \
+-mon chardev=char0,mode=readline \
-parallel chardev:char0 \
-chardev tcp,...,mux=on,id=char1 \
-serial chardev:char1 \
@@ -3112,9 +3112,9 @@ Like -qmp but uses pretty JSON formatting.
ETEXI
DEF("mon", HAS_ARG, QEMU_OPTION_mon, \
- "-mon [chardev=]name[,mode=readline|control][,default]\n", QEMU_ARCH_ALL)
+ "-mon [chardev=]name[,mode=readline|control]\n", QEMU_ARCH_ALL)
STEXI
address@hidden -mon [chardev=]name[,mode=readline|control][,default]
address@hidden -mon [chardev=]name[,mode=readline|control]
@findex -mon
Setup monitor on chardev @var{name}.
ETEXI
diff --git a/vl.c b/vl.c
index 74dfe4e..496e655 100644
--- a/vl.c
+++ b/vl.c
@@ -2408,8 +2408,9 @@ 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))
- flags |= MONITOR_IS_DEFAULT;
+ 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);
@@ -2428,16 +2429,12 @@ static void monitor_parse(const char *optarg, const
char *mode, bool pretty)
QemuOpts *opts;
const char *p;
char label[32];
- int def = 0;
if (strstart(optarg, "chardev:", &p)) {
snprintf(label, sizeof(label), "%s", p);
} else {
snprintf(label, sizeof(label), "compat_monitor%d",
monitor_device_index);
- if (monitor_device_index == 0) {
- def = 1;
- }
opts = qemu_chr_parse_compat(label, optarg);
if (!opts) {
error_report("parse error: %s", optarg);
@@ -2449,8 +2446,6 @@ static void monitor_parse(const char *optarg, const char
*mode, bool pretty)
qemu_opt_set(opts, "mode", mode, &error_abort);
qemu_opt_set(opts, "chardev", label, &error_abort);
qemu_opt_set_bool(opts, "pretty", pretty, &error_abort);
- if (def)
- qemu_opt_set(opts, "default", "on", &error_abort);
monitor_device_index++;
}
--
2.1.4
- [Qemu-trivial] [PULL 08/23] target-lm32: rewrite gen_compare(), (continued)
- [Qemu-trivial] [PULL 08/23] target-lm32: rewrite gen_compare(), Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 02/23] hw/tpm/tpm_passthrough: Simplify if-statements a little bit, Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 05/23] target-lm32: swap operand of wcsr in LOG_DIS(), Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 19/23] qemu-ga: Remove stray 'q' in documentation, Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 11/23] colo-compare: remove unused struct CompareChardevProps and 'props' variable, Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 13/23] usb: Change *_exitfn return type from int to void, Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 06/23] target-lm32: disable asm logging via LOG_DIS(), Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 17/23] s390: avoid always-true comparison in s390_pci_generate_fid(), Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 04/23] target-lm32: fix LOG_DIS operand order, Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 23/23] Fix build for less common build directories names, Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 20/23] monitor: deprecate 'default' option,
Michael Tokarev <=
- [Qemu-trivial] [PULL 03/23] target-lm32: fix style issue, Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 15/23] scripts/hxtool: fix undefined behavour of echo, Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 18/23] Makefile: Fix help text for target 'installer', Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 14/23] qemu-options.hx: set: fix copy-paste error, Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 16/23] migration: Remove unneeded NULL check from migrate_fd_error(), Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 21/23] scripts/clean-includes: added duplicate #include check, Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 10/23] milkymist-pfpu: fix potential integer overflow, Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 09/23] hw/block/nvme: Simplify if-statements a little bit, Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 12/23] MAINTAINERS: qemu-trivial information, Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 22/23] clean-up: removed duplicate #includes, Michael Tokarev, 2016/10/28