From: Peter Maydell Date: Tue, 21 Aug 2018 09:23:53 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging X-Git-Tag: v3.1.0-rc0~126 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=55f4e79d794d94b2ab22b0dc99c6b05abc628656;p=thirdparty%2Fqemu.git Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging pc: fixes This includes nvdimm persistence fixes queued before the release. Signed-off-by: Michael S. Tsirkin # gpg: Signature made Mon 20 Aug 2018 11:38:11 BST # gpg: using RSA key 281F0DB8D28D5469 # gpg: Good signature from "Michael S. Tsirkin " # gpg: aka "Michael S. Tsirkin " # 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: migration/ram: ensure write persistence on loading all data to PMEM. migration/ram: Add check and info message to nvdimm post copy. mem/nvdimm: ensure write persistence to PMEM in label emulation hostmem-file: add the 'pmem' option configure: add libpmem support memory, exec: switch file ram allocation functions to 'flags' parameters memory, exec: Expose all memory block related flags. Signed-off-by: Peter Maydell --- 55f4e79d794d94b2ab22b0dc99c6b05abc628656