Merge remote-tracking branch 'remotes/armbru/tags/pull-monitor-2020-07-21' into staging

pm215 · pm215 · commit 3cbc8970f55c · 2020-07-22T09:13:46.000+01:00
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 &lt;armbru@redhat.com&gt;" [full]
# gpg:                 aka "Markus Armbruster &lt;armbru@pond.sub.org&gt;" [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 &lt;peter.maydell@linaro.org&gt;
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -300,7 +300,7 @@ int qdev_device_help(QemuOpts *opts)`
`300`	`300`	`}`
`301`	`301`	`g_ptr_array_sort(array, (GCompareFunc)qemu_pstrcmp0);`
`302`	`302`	`for (i = 0; i < array->len; i++) {`
`303`		`- printf("%s\n", (char *)array->pdata[i]);`
	`303`	`+ qemu_printf("%s\n", (char *)array->pdata[i]);`
`304`	`304`	`}`
`305`	`305`	`g_ptr_array_set_free_func(array, g_free);`
`306`	`306`	`g_ptr_array_free(array, true);`