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

Revert "qmp: don't make -qmp disable the default monitor"

Browse Source 
This reverts commit d49f626ed00cecc90fb1ff88da9bdf11e57094d1.
This commit is contained in:
Anthony Liguori 2010-03-21 14:14:38 -05:00
parent 31dc63dfa1
commit 2d114dc16f
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
vl.c
View File

@ -276,7 +276,6 @@ static int default_vga = 1;
static int default_floppy = 1;
static int default_cdrom = 1;
static int default_sdcard = 1;
static int default_qmp = 1;
static struct {
const char *driver;
@ -4300,22 +4299,15 @@ int main(int argc, char **argv, char **envp)
break;
case QEMU_OPTION_qmp:
monitor_parse(optarg, "control");
default_qmp = 0;
default_monitor = 0;
break;
case QEMU_OPTION_mon:
opts = qemu_opts_parse(&qemu_mon_opts, optarg, 1);
if (!opts) {
fprintf(stderr, "parse error: %s\n", optarg);
exit(1);
} else {
const char *mode;
mode = qemu_opt_get(opts, "mode");
if (mode == NULL || strcmp(mode, "readline") == 0) {
default_monitor = 0;
} else if (strcmp(mode, "control") == 0) {
default_qmp = 0;
}
}
default_monitor = 0;
break;
case QEMU_OPTION_chardev:
opts = qemu_opts_parse(&qemu_chardev_opts, optarg, 1);
@ -4553,7 +4545,6 @@ int main(int argc, char **argv, char **envp)
default_parallel = 0;
default_virtcon = 0;
default_monitor = 0;
default_qmp = 0;
default_vga = 0;
default_net = 0;
default_floppy = 0;