diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2021-11-03 11:24:09 -0400 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2021-11-03 11:24:09 -0400 |
| commit | c55e3370c359713ff1e2a3392f36978c629c20c8 (patch) | |
| tree | 33de54c03d09e33ff830e7437b5e4d0a86b53616 /hw/core | |
| parent | cc23377516072d293b0f9ab04741f8982d274639 (diff) | |
| parent | 5d2bd73588d14b5868129ace9c7912a777f06753 (diff) | |
| download | qemu-c55e3370c359713ff1e2a3392f36978c629c20c8.zip qemu-c55e3370c359713ff1e2a3392f36978c629c20c8.tar.gz qemu-c55e3370c359713ff1e2a3392f36978c629c20c8.tar.bz2 | |
Merge remote-tracking branch 'remotes/vivier/tags/trivial-branch-for-6.2-pull-request' into staging
Trivial patches branch pull request 20211101 v2
# gpg: Signature made Tue 02 Nov 2021 07:21:44 PM EDT
# gpg: using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C
# gpg: issuer "laurent@vivier.eu"
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg: aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
* remotes/vivier/tags/trivial-branch-for-6.2-pull-request:
hw/input/lasips2: Fix typos in function names
MAINTAINERS: Split HPPA TCG vs HPPA machines/hardware
hw/core/machine: Add the missing delimiter in cpu_slot_to_string()
monitor: Trim some trailing space from human-readable output
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'hw/core')
| -rw-r--r-- | hw/core/machine.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/hw/core/machine.c b/hw/core/machine.c index e24e3e2..948b3d9 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -978,6 +978,9 @@ static char *cpu_slot_to_string(const CPUArchId *cpu) g_string_append_printf(s, "socket-id: %"PRId64, cpu->props.socket_id); } if (cpu->props.has_die_id) { + if (s->len) { + g_string_append_printf(s, ", "); + } g_string_append_printf(s, "die-id: %"PRId64, cpu->props.die_id); } if (cpu->props.has_core_id) { |