Monitor patches for 2020-07-21

-----BEGIN PGP SIGNATURE-----
 
 iQJGBAABCAAwFiEENUvIs9frKmtoZ05fOHC0AOuRhlMFAl8XCG8SHGFybWJydUBy
 ZWRoYXQuY29tAAoJEDhwtADrkYZTakMP/2mpbN0n4kk+w/5KvOwiW5kuejfW3ss5
 wqmaIGo6HfQOPjoi/z7OxaV2ZmDSTssG7fwUu3qxrZh9ioSHaqZoLk1xkPvK90gE
 Hfz7OurKrhs44uu8jxf8rI2VsBQ/RDL8v23VOpgm5EiYgBa3DfS6ceqnnzX34iOd
 c95BsaR3gojhwiro+rbbMUipzB+tziyr2a+xY7QjXCrLpIZdSydY+qR/YeAn5iWK
 hrGd8cCzh3EuVgxR2JyvI42RF+vxqUq39Ta9M9k5los0B/d8/tYkR4b5SYA91mRX
 D747NwSVh28i5YXTFmz6afwiDpu8azQ7FtiL/XohRo00nr5xaeK5T3CtbYQg01lP
 febNNu1XK5XmVCYzH0XfhdziCV8kzR+QnCB8fr2P9WDEVVd2tGqOFRrwxgwjtV2N
 MGFU+HBg4LJuOR3wPtcQGj07fOQ+Q0ZXLUJ32fpD6I67f1wtjJOtLxYhmsVxZln6
 7JGkQTJ2OoR8NdC5oPckmpGzpdae9t55rYdk1iXfo+Sc+S4jGA29bfyvAi+uQ62O
 dTSvFEvj0EmK7TOgA+Zp6/nHc7qm3P9zI3dgR7ywSYCuHWH48QU86vnD6W8sY6vq
 u8DWnx0m76i2imArFxBhR1Fjhf1MsvEdd/hGUh7vaiIlbQDtFFUtbNyKqVupIybQ
 elindDFX8Bo/
 =Ds3x
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Peter Maydell 2020-07-22 09:13:46 +01:00
commit 3cbc8970f5

View File

@ -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);