diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-07-21 18:31:52 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-07-21 18:31:52 +0100 |
| commit | b50dab9ecac442acc1b316e4749dae36a2fe7d61 (patch) | |
| tree | 1d95a3797c7ceaf5aef73046677302c5860a2687 /gdbstub.c | |
| parent | a418695e1b177da055d477c4e15ce900c01a94fd (diff) | |
| parent | 0dde9fd12fd39762ff68fca80d2f0a735d66e7bd (diff) | |
| download | focaccia-qemu-b50dab9ecac442acc1b316e4749dae36a2fe7d61.tar.gz focaccia-qemu-b50dab9ecac442acc1b316e4749dae36a2fe7d61.zip | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-qom-2020-07-21' into staging
QOM patches for 2020-07-21 # gpg: Signature made Tue 21 Jul 2020 16:40:27 BST # gpg: using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653 # gpg: issuer "armbru@redhat.com" # gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full] # gpg: aka "Markus Armbruster <armbru@pond.sub.org>" [full] # Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653 * remotes/armbru/tags/pull-qom-2020-07-21: qom: Make info qom-tree sort children more efficiently qom: Document object_get_canonical_path() returns malloced string qom: Change object_get_canonical_path_component() not to malloc Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'gdbstub.c')
| -rw-r--r-- | gdbstub.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gdbstub.c b/gdbstub.c index 6950fd243f..f3a318cd7f 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -2059,7 +2059,7 @@ static void handle_query_thread_extra(GdbCmdContext *gdb_ctx, void *user_ctx) /* Print the CPU model and name in multiprocess mode */ ObjectClass *oc = object_get_class(OBJECT(cpu)); const char *cpu_model = object_class_get_name(oc); - g_autofree char *cpu_name = + const char *cpu_name = object_get_canonical_path_component(OBJECT(cpu)); g_string_printf(rs, "%s %s [%s]", cpu_model, cpu_name, cpu->halted ? "halted " : "running"); |