diff options
| author | Richard Henderson | 2021-11-03 16:24:09 +0100 |
|---|---|---|
| committer | Richard Henderson | 2021-11-03 16:24:09 +0100 |
| commit | c55e3370c359713ff1e2a3392f36978c629c20c8 (patch) | |
| tree | 33de54c03d09e33ff830e7437b5e4d0a86b53616 /monitor | |
| parent | Merge remote-tracking branch 'remotes/rth/tags/pull-arm-20211102-2' into staging (diff) | |
| parent | hw/input/lasips2: Fix typos in function names (diff) | |
| download | qemu-c55e3370c359713ff1e2a3392f36978c629c20c8.tar.gz qemu-c55e3370c359713ff1e2a3392f36978c629c20c8.tar.xz qemu-c55e3370c359713ff1e2a3392f36978c629c20c8.zip | |
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 'monitor')
| -rw-r--r-- | monitor/hmp-cmds.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c index 8ef605e29a..9c91bf93e9 100644 --- a/monitor/hmp-cmds.c +++ b/monitor/hmp-cmds.c @@ -1875,7 +1875,7 @@ void hmp_rocker_ports(Monitor *mon, const QDict *qdict) monitor_printf(mon, " port link duplex neg?\n"); for (port = list; port; port = port->next) { - monitor_printf(mon, "%10s %-4s %-3s %2s %-3s\n", + monitor_printf(mon, "%10s %-4s %-3s %2s %s\n", port->value->name, port->value->enabled ? port->value->link_up ? "up" : "down" : "!ena", |