Skip to content
  • Peter Maydell's avatar
    Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging · 55f4e79d
    Peter Maydell authored
    
    
    pc: fixes
    
    This includes nvdimm persistence fixes queued before the release.
    
    Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
    
    # gpg: Signature made Mon 20 Aug 2018 11:38:11 BST
    # gpg:                using RSA key 281F0DB8D28D5469
    # gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
    # gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>"
    # 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: default avatarPeter Maydell <peter.maydell@linaro.org>
    55f4e79d