diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-07-22 09:13:46 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-07-22 09:13:46 +0100 |
| commit | 3cbc8970f55c87cb58699b6dc8fe42998bc79dc0 (patch) | |
| tree | ee6a40cbe5004bb55bed985150b2f581c76a5cb0 | |
| parent | c8004fe6bbfc0d9c2e7b942c418a85efb3ac4b00 (diff) | |
| parent | 029afc4e76041e1a320530d97f99122a1b3d5da2 (diff) | |
| download | qemu-3cbc8970f55c87cb58699b6dc8fe42998bc79dc0.zip qemu-3cbc8970f55c87cb58699b6dc8fe42998bc79dc0.tar.gz qemu-3cbc8970f55c87cb58699b6dc8fe42998bc79dc0.tar.bz2 | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-monitor-2020-07-21' into staging
Monitor patches for 2020-07-21
# gpg: Signature made Tue 21 Jul 2020 16:23: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-monitor-2020-07-21:
qdev: Fix device_add DRIVER,help to print to monitor
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | qdev-monitor.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qdev-monitor.c b/qdev-monitor.c index 71ebce1..e9b7228 100644 --- a/qdev-monitor.c +++ b/qdev-monitor.c @@ -300,7 +300,7 @@ int qdev_device_help(QemuOpts *opts) } g_ptr_array_sort(array, (GCompareFunc)qemu_pstrcmp0); for (i = 0; i < array->len; i++) { - printf("%s\n", (char *)array->pdata[i]); + qemu_printf("%s\n", (char *)array->pdata[i]); } g_ptr_array_set_free_func(array, g_free); g_ptr_array_free(array, true); |