From: Peter Maydell Date: Wed, 20 Nov 2019 11:01:20 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging X-Git-Tag: v4.2.0-rc3~16 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bf12043acc6458e7b71d19a9f030b31ec22fba12;p=thirdparty%2Fqemu.git Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging virtio, acpi: fixes A couple of bugfixes. Signed-off-by: Michael S. Tsirkin # gpg: Signature made Wed 20 Nov 2019 09:57:44 GMT # gpg: using RSA key 5D09FD0871C8F85B94CA8A0D281F0DB8D28D5469 # gpg: issuer "mst@redhat.com" # gpg: Good signature from "Michael S. Tsirkin " [full] # gpg: aka "Michael S. Tsirkin " [full] # Primary key fingerprint: 0270 606B 6F3C DF3D 0B17 0970 C350 3912 AFBE 8E67 # Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA 8A0D 281F 0DB8 D28D 5469 * remotes/mst/tags/for_upstream: tests: acpi: always retain dumped ACPI tables in case of error vhost-user-input: use free(elem) instead of g_free(elem) libvhost-user: Zero memory allocated for VuVirtqInflightDesc Signed-off-by: Peter Maydell --- bf12043acc6458e7b71d19a9f030b31ec22fba12