diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-11-16 22:29:51 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-11-16 22:29:51 +0000 |
| commit | bce36c6c5436c0c2679b42c6de54de5393dfcf59 (patch) | |
| tree | d42fbebb76a47201f85b1e95fa85ac01cee03c2a /softmmu | |
| parent | b17d3b7b77f043f0e76f0e6ce6def3c1b1d5ee8b (diff) | |
| parent | 1370d61ae3c9934861d2349349447605202f04e9 (diff) | |
Merge remote-tracking branch 'remotes/bonzini-gitlab/tags/for-upstream' into staging
Bug fixes
# gpg: Signature made Mon 16 Nov 2020 18:22:51 GMT
# gpg: using RSA key F13338574B662389866C7682BFFBD25F78C7AE83
# gpg: issuer "pbonzini@redhat.com"
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [full]
# gpg: aka "Paolo Bonzini <pbonzini@redhat.com>" [full]
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4 E2F7 7E15 100C CD36 69B1
# Subkey fingerprint: F133 3857 4B66 2389 866C 7682 BFFB D25F 78C7 AE83
* remotes/bonzini-gitlab/tags/for-upstream:
memory: Skip dirty tracking for un-migratable memory regions
target/i386: avoid theoretical leak on MCE injection
scsi-disk: convert more errno values back to SCSI statuses
util/vfio-helpers.c: Use ram_block_discard_disable() in qemu_vfio_open_pci()
kvm/i386: Set proper nested state format for SVM
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'softmmu')
| -rw-r--r-- | softmmu/memory.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/softmmu/memory.c b/softmmu/memory.c index 71951fe4dc..aa393f1bb0 100644 --- a/softmmu/memory.c +++ b/softmmu/memory.c @@ -1806,7 +1806,10 @@ bool memory_region_is_ram_device(MemoryRegion *mr) uint8_t memory_region_get_dirty_log_mask(MemoryRegion *mr) { uint8_t mask = mr->dirty_log_mask; - if (global_dirty_log && (mr->ram_block || memory_region_is_iommu(mr))) { + RAMBlock *rb = mr->ram_block; + + if (global_dirty_log && ((rb && qemu_ram_is_migratable(rb)) || + memory_region_is_iommu(mr))) { mask |= (1 << DIRTY_MEMORY_MIGRATION); } return mask; |