From: Peter Maydell Date: Tue, 12 Nov 2019 12:09:19 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-pull-request' into... X-Git-Tag: qemu-xen-4.14.0~284 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=039e285e095c20a88e623b927654b161aaf9d914;p=qemu-xen.git Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-pull-request' into staging Trivial fixes (20191112) ivshmem-server, error messages (numa, qom) and Makefile (bios-microvm) fixes # gpg: Signature made Tue 12 Nov 2019 10:04:03 GMT # gpg: using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C # gpg: issuer "laurent@vivier.eu" # gpg: Good signature from "Laurent Vivier " [full] # gpg: aka "Laurent Vivier " [full] # gpg: aka "Laurent Vivier (Red Hat) " [full] # Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C * remotes/vivier2/tags/trivial-branch-pull-request: ivshmem-server: Terminate also on SIGINT ivshmem-server: Clean up shmem on shutdown numa: Add missing \n to error message qom: Fix error message in object_class_property_add() Makefile: install bios-microvm like other binary blobs Signed-off-by: Peter Maydell --- 039e285e095c20a88e623b927654b161aaf9d914