diff --git a/chardev/char.c b/chardev/char.c index bcfc065d16f7567d0d82f81b7a902a97d070004f..2b679a2295c6053086f50687925bf2d1845af7b8 100644 --- a/chardev/char.c +++ b/chardev/char.c @@ -951,6 +951,18 @@ void qmp_chardev_remove(const char *id, Error **errp) object_unparent(OBJECT(chr)); } +void qmp_chardev_send_break(const char *id, Error **errp) +{ + Chardev *chr; + + chr = qemu_chr_find(id); + if (chr == NULL) { + error_setg(errp, "Chardev '%s' not found", id); + return; + } + qemu_chr_be_event(chr, CHR_EVENT_BREAK); +} + void qemu_chr_cleanup(void) { object_unparent(get_chardevs_root()); diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx index ae169011b13b34b281b7e28846d3f9d0e8b91cfc..ba98e581ab1c32964549edbad1d66cb2b71a80fd 100644 --- a/hmp-commands-info.hx +++ b/hmp-commands-info.hx @@ -100,9 +100,9 @@ ETEXI { .name = "registers", - .args_type = "", - .params = "", - .help = "show the cpu registers", + .args_type = "cpustate_all:-a", + .params = "[-a]", + .help = "show the cpu registers (-a: all - show register info for all cpus)", .cmd = hmp_info_registers, }, diff --git a/hmp-commands.hx b/hmp-commands.hx index e763606fe516fae447c86bac80caee6f77c103ee..275ccdfbc799f8778f2e2c9eb0686d9dd7105284 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1742,6 +1742,22 @@ STEXI @findex chardev-remove Removes the chardev @var{id}. +ETEXI + + { + .name = "chardev-send-break", + .args_type = "id:s", + .params = "id", + .help = "send a break on chardev", + .cmd = hmp_chardev_send_break, + .command_completion = chardev_remove_completion, + }, + +STEXI +@item chardev-send-break id +@findex chardev-send-break +Send a break on the chardev @var{id}. + ETEXI { diff --git a/hmp.c b/hmp.c index 4c41cac62565ba8104f328b9586560feda9e6e50..dee40284c16f0cd50e1df9a7411b3b1b10cc797b 100644 --- a/hmp.c +++ b/hmp.c @@ -2236,6 +2236,14 @@ void hmp_chardev_remove(Monitor *mon, const QDict *qdict) hmp_handle_error(mon, &local_err); } +void hmp_chardev_send_break(Monitor *mon, const QDict *qdict) +{ + Error *local_err = NULL; + + qmp_chardev_send_break(qdict_get_str(qdict, "id"), &local_err); + hmp_handle_error(mon, &local_err); +} + void hmp_qemu_io(Monitor *mon, const QDict *qdict) { BlockBackend *blk; diff --git a/hmp.h b/hmp.h index d8b94ce9dc3460ce51b1d56fec77a19272092546..214b2617e76d031fdb23391dc231d24272de3036 100644 --- a/hmp.h +++ b/hmp.h @@ -103,6 +103,7 @@ void hmp_nbd_server_add(Monitor *mon, const QDict *qdict); void hmp_nbd_server_stop(Monitor *mon, const QDict *qdict); void hmp_chardev_add(Monitor *mon, const QDict *qdict); void hmp_chardev_remove(Monitor *mon, const QDict *qdict); +void hmp_chardev_send_break(Monitor *mon, const QDict *qdict); void hmp_qemu_io(Monitor *mon, const QDict *qdict); void hmp_cpu_add(Monitor *mon, const QDict *qdict); void hmp_object_add(Monitor *mon, const QDict *qdict); diff --git a/monitor.c b/monitor.c index 3c369f4dd5a2927bcc80def5cf3bb5bea8d0c26d..40318764119e4544c8508d1a7fee21f449e833ea 100644 --- a/monitor.c +++ b/monitor.c @@ -1078,13 +1078,24 @@ int monitor_get_cpu_index(void) static void hmp_info_registers(Monitor *mon, const QDict *qdict) { - CPUState *cs = mon_get_cpu(); + bool all_cpus = qdict_get_try_bool(qdict, "cpustate_all", false); + CPUState *cs; - if (!cs) { - monitor_printf(mon, "No CPU available\n"); - return; + if (all_cpus) { + CPU_FOREACH(cs) { + monitor_printf(mon, "\nCPU#%d\n", cs->cpu_index); + cpu_dump_state(cs, (FILE *)mon, monitor_fprintf, CPU_DUMP_FPU); + } + } else { + cs = mon_get_cpu(); + + if (!cs) { + monitor_printf(mon, "No CPU available\n"); + return; + } + + cpu_dump_state(cs, (FILE *)mon, monitor_fprintf, CPU_DUMP_FPU); } - cpu_dump_state(cs, (FILE *)mon, monitor_fprintf, CPU_DUMP_FPU); } static void hmp_info_jit(Monitor *mon, const QDict *qdict) diff --git a/qapi-schema.json b/qapi-schema.json index 9e34cf71f37fd5d57503a4eefc898e8fbbfcafd1..37c4b95aadd0b161e2b9ec936ef4fea346d4162a 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -5116,6 +5116,26 @@ ## { 'command': 'chardev-remove', 'data': {'id': 'str'} } +## +# @chardev-send-break: +# +# Send a break to a character device +# +# @id: the chardev's ID, must exist +# +# Returns: Nothing on success +# +# Since: 2.10 +# +# Example: +# +# -> { "execute": "chardev-send-break", "arguments": { "id" : "foo" } } +# <- { "return": {} } +# +## +{ 'command': 'chardev-send-break', 'data': {'id': 'str'} } + + ## # @TpmModel: # diff --git a/tests/test-char.c b/tests/test-char.c index 9e361c8d098dd9e48478c38823814053a88ce7f7..87c724c5c2e4fa53eb7080b56ffe32bbc5729a32 100644 --- a/tests/test-char.c +++ b/tests/test-char.c @@ -53,7 +53,9 @@ static void fe_event(void *opaque, int event) FeHandler *h = opaque; h->last_event = event; - quit = true; + if (event != CHR_EVENT_BREAK) { + quit = true; + } } #ifdef CONFIG_HAS_GLIB_SUBPROCESS_TESTS @@ -517,7 +519,7 @@ static void char_file_test(void) file.in = fifo; file.has_in = true; - chr = qemu_chardev_new(NULL, TYPE_CHARDEV_FILE, &backend, + chr = qemu_chardev_new("label-file", TYPE_CHARDEV_FILE, &backend, &error_abort); qemu_chr_fe_init(&be, chr, &error_abort); @@ -527,6 +529,12 @@ static void char_file_test(void) fe_event, &fe, NULL, true); + g_assert_cmpint(fe.last_event, !=, CHR_EVENT_BREAK); + qmp_chardev_send_break("label-foo", NULL); + g_assert_cmpint(fe.last_event, !=, CHR_EVENT_BREAK); + qmp_chardev_send_break("label-file", NULL); + g_assert_cmpint(fe.last_event, ==, CHR_EVENT_BREAK); + main_loop(); close(fd); diff --git a/tests/test-hmp.c b/tests/test-hmp.c index 99e35ec15aea8786c3e3ff8f1e9993b50ede9f5e..6dfa0c36e2986e93ecc436ef6dc5ffd64804ff74 100644 --- a/tests/test-hmp.c +++ b/tests/test-hmp.c @@ -22,6 +22,7 @@ static int verbose; static const char *hmp_cmds[] = { "boot_set ndc", "chardev-add null,id=testchardev1", + "chardev-send-break testchardev2", "chardev-remove testchardev1", "commit all", "cpu-add 1",