From: Peter Maydell Date: Tue, 21 Jul 2020 17:31:52 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/armbru/tags/pull-qom-2020-07-21' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b50dab9ecac442acc1b316e4749dae36a2fe7d61;p=qemu.git Merge remote-tracking branch 'remotes/armbru/tags/pull-qom-2020-07-21' into staging QOM patches for 2020-07-21 # gpg: Signature made Tue 21 Jul 2020 16:40:27 BST # gpg: using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653 # gpg: issuer "armbru@redhat.com" # gpg: Good signature from "Markus Armbruster " [full] # gpg: aka "Markus Armbruster " [full] # Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653 * remotes/armbru/tags/pull-qom-2020-07-21: qom: Make info qom-tree sort children more efficiently qom: Document object_get_canonical_path() returns malloced string qom: Change object_get_canonical_path_component() not to malloc Signed-off-by: Peter Maydell --- b50dab9ecac442acc1b316e4749dae36a2fe7d61