mirrors/qemu
0
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2024-12-01 07:43:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

HMP pull 2017-06-29

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQIcBAABAgAGBQJZVSqLAAoJEAUWMx68W/3nKnEP/0FnKrLTLgM0I5Ux7rWYpXR+
 3uX3J6vmi5glaXrme8+JAmNaP7R7X/5bDYS8EFA2FkYi7Mg2BIRs2sZsICaSC5le
 8TH/KwWeO66eFdPP1e4res4JMPAljr310OsZXib67AcApY/C1OWycmQrip4UiX7W
 vdj5ENbeZq0zKCfSOEVF4SztKfvNeDDpq7yhsGA9NFscT0+sgIJdfvjdUiD45GbA
 3/t6n0hIvCSyiQrsLy6DSBiRk5/Wb5bgT8gJD6nyHNrC7jBn8jHf2OTCd9MfGb0E
 FH5ygSyEG3SBRsvo4iDBUtWy80npqxxv6zx+TDz94mo+6g+LUXtizxTuw2HCqhSg
 UGlKfOg73W/kkEWlIqMBLDaT4ac55AbwRhd1C2PrzmucBo2joQ9lKdmpIkOPCP68
 wzhRYQQHwLfWt4aDfaptoixt+tgzXJS/Fyu2lMuMWyT1IBS8c/AjK/bLqQ3wG0y4
 wK9W3d+aC8o/rs7txFBdOs6cc3s8TvtMRLG1ylVYHJzuGdv2AARlidQtLi9uKvQJ
 TKZae8UDIFXJoIg0VJcNN/HMcR4WXKSABNRror54IpHcQ7bwai7xRxF7vHMl76Dc
 gUklC2ch95BQ0l3n8/YFZ0FIiIqWzjyqukxIdxKv+emj9DrUhEa4RGG6zxzgu1ST
 8UagOQP5HoQmopV1WSiG
 =lasz
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/dgilbert/tags/pull-hmp-20170629' into staging

HMP pull 2017-06-29

# gpg: Signature made Thu 29 Jun 2017 17:27:55 BST
# gpg:                using RSA key 0x0516331EBC5BFDE7
# gpg: Good signature from "Dr. David Alan Gilbert (RH2) <dgilbert@redhat.com>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 45F5 C71B 4A0C B7FB 977A  9FA9 0516 331E BC5B FDE7

* remotes/dgilbert/tags/pull-hmp-20170629:
  Add chardev-send-break monitor command
  monitor: Add -a (all) option to info registers

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2017-06-29 17:37:11 +01:00
commit c5eb5846d2
9 changed files with 87 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
chardev/char.c
View File

@ -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());

6
hmp-commands-info.hx
View File

@ -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,
},

16
hmp-commands.hx
View File

@ -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
{

8
hmp.c
View File

@ -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;

1
hmp.h
View File

@ -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);

21
monitor.c
View File

@ -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)

20
qapi-schema.json
View File

@ -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:
#

12
tests/test-char.c
View File

@ -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);

1
tests/test-hmp.c
View File

@ -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",