Revision d49f626e

b/vl.c
273 273
static int default_floppy = 1;
274 274
static int default_cdrom = 1;
275 275
static int default_sdcard = 1;
276
static int default_qmp = 1;
276 277

  
277 278
static struct {
278 279
    const char *driver;
......
4269 4270
                break;
4270 4271
            case QEMU_OPTION_qmp:
4271 4272
                monitor_parse(optarg, "control");
4272
                default_monitor = 0;
4273
                default_qmp = 0;
4273 4274
                break;
4274 4275
            case QEMU_OPTION_mon:
4275 4276
                opts = qemu_opts_parse(&qemu_mon_opts, optarg, 1);
4276 4277
                if (!opts) {
4277 4278
                    fprintf(stderr, "parse error: %s\n", optarg);
4278 4279
                    exit(1);
4280
                } else {
4281
                    const char *mode;
4282
                    mode = qemu_opt_get(opts, "mode");
4283
                    if (mode == NULL || strcmp(mode, "readline") == 0) {
4284
                        default_monitor = 0;
4285
                    } else if (strcmp(mode, "control") == 0) {
4286
                        default_qmp = 0;
4287
                    }
4279 4288
                }
4280
                default_monitor = 0;
4281 4289
                break;
4282 4290
            case QEMU_OPTION_chardev:
4283 4291
                opts = qemu_opts_parse(&qemu_chardev_opts, optarg, 1);
......
4515 4523
                default_parallel = 0;
4516 4524
                default_virtcon = 0;
4517 4525
                default_monitor = 0;
4526
                default_qmp = 0;
4518 4527
                default_vga = 0;
4519 4528
                default_net = 0;
4520 4529
                default_floppy = 0;

Also available in: Unified diff