- disable default monitor when HMP is not available - hide 'readline' from -mon help text - error out on mux chardev monitor when no HMP - skip HMP monitor terminal for gdb, return E01 for 'qRcmd' remote commands
Signed-off-by: Marc-André Lureau <[email protected]> --- chardev/char.c | 9 ++++++++- gdbstub/system.c | 8 ++++++++ qemu-options.hx | 6 +++++- system/vl.c | 4 ++++ 4 files changed, 25 insertions(+), 2 deletions(-) diff --git a/chardev/char.c b/chardev/char.c index 22e5bae388ad..c6c8133f5c1d 100644 --- a/chardev/char.c +++ b/chardev/char.c @@ -804,8 +804,9 @@ static Chardev *qemu_chr_new_from_name(const char *label, const char *filename, } if (qemu_opt_get_bool(opts, "mux", 0)) { - const char *chardev_id = qemu_opts_id(opts); assert(permit_mux_mon); +#ifdef CONFIG_HMP + const char *chardev_id = qemu_opts_id(opts); monitor_new_hmp(NULL, chardev_id, true, &err); if (err) { error_report_err(err); @@ -813,6 +814,12 @@ static Chardev *qemu_chr_new_from_name(const char *label, const char *filename, chr = NULL; goto out; } +#else + error_report("HMP monitor is disabled"); + object_unparent(OBJECT(chr)); + chr = NULL; + goto out; +#endif } out: diff --git a/gdbstub/system.c b/gdbstub/system.c index c77d067ab458..070bc26f416c 100644 --- a/gdbstub/system.c +++ b/gdbstub/system.c @@ -387,10 +387,14 @@ bool gdbserver_start(const char *device, Error **errp) qemu_add_vm_change_state_handler(gdb_vm_state_change, NULL); +#ifdef CONFIG_HMP /* Initialize a monitor terminal for gdb */ mon_chr = qemu_chardev_new(NULL, TYPE_CHARDEV_GDB, NULL, NULL, &error_abort); monitor_new_hmp(NULL, mon_chr->label, false, &error_abort); +#else + mon_chr = NULL; +#endif } else { qemu_chr_fe_deinit(&gdbserver_system_state.chr, true); mon_chr = gdbserver_system_state.mon_chr; @@ -524,10 +528,14 @@ void gdb_handle_query_rcmd(GArray *params, void *ctx) len = len / 2; gdb_hextomem(gdbserver_state.mem_buf, gdb_get_cmd_param(params, 0)->data, len); g_byte_array_append(gdbserver_state.mem_buf, &zero, 1); +#ifdef CONFIG_HMP qemu_chr_be_write(gdbserver_system_state.mon_chr, gdbserver_state.mem_buf->data, gdbserver_state.mem_buf->len); gdb_put_packet("OK"); +#else + gdb_put_packet("E01"); +#endif } /* diff --git a/qemu-options.hx b/qemu-options.hx index 34970fffc94b..680344162efb 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -4985,7 +4985,11 @@ SRST ERST DEF("mon", HAS_ARG, QEMU_OPTION_mon, \ - "-mon [chardev=]name[,mode=readline|control][,pretty=on|off]\n", QEMU_ARCH_ALL) + "-mon [chardev=]name[,mode=" +#ifdef CONFIG_HMP + "readline|" +#endif + "control][,pretty=on|off]\n", QEMU_ARCH_ALL) SRST ``-mon [chardev=]name[,mode=readline|control][,pretty=on|off]`` Set up a monitor connected to the chardev ``name``. diff --git a/system/vl.c b/system/vl.c index 5ccc19282ba2..760cf6e7265a 100644 --- a/system/vl.c +++ b/system/vl.c @@ -199,7 +199,11 @@ static int has_defaults = 1; static int default_audio = 1; static int default_serial = 1; static int default_parallel = 1; +#ifdef CONFIG_HMP static int default_monitor = 1; +#else +static int default_monitor; /* false */ +#endif static int default_floppy = 1; static int default_cdrom = 1; static bool auto_create_sdcard = true; -- 2.55.0.543.g5ebe2ebe4ea8
