diff options
| author | Peter Maydell | 2021-02-08 19:23:47 +0100 |
|---|---|---|
| committer | Peter Maydell | 2021-02-08 19:23:47 +0100 |
| commit | 2436651b26584c8ebe91db5df67ee054509a0949 (patch) | |
| tree | 9f7241de2fb5aa8d82e07433d081fd446250d527 /include/exec | |
| parent | Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2021-02-08' into ... (diff) | |
| parent | migration: only check page size match if RAM postcopy is enabled (diff) | |
| download | qemu-2436651b26584c8ebe91db5df67ee054509a0949.tar.gz qemu-2436651b26584c8ebe91db5df67ee054509a0949.tar.xz qemu-2436651b26584c8ebe91db5df67ee054509a0949.zip | |
Merge remote-tracking branch 'remotes/dgilbert/tags/pull-migration-20210208a' into staging
Migration pull 2021-02-08
v2
Dropped vmstate: Fix memory leak in vmstate_handle_alloc
Broke on Power
Added migration: only check page size match if RAM postcopy is enabled
# gpg: Signature made Mon 08 Feb 2021 11:28:14 GMT
# gpg: using RSA key 45F5C71B4A0CB7FB977A9FA90516331EBC5BFDE7
# gpg: Good signature from "Dr. David Alan Gilbert (RH2) <dgilbert@redhat.com>" [full]
# Primary key fingerprint: 45F5 C71B 4A0C B7FB 977A 9FA9 0516 331E BC5B FDE7
* remotes/dgilbert/tags/pull-migration-20210208a: (27 commits)
migration: only check page size match if RAM postcopy is enabled
migration: introduce snapshot-{save, load, delete} QMP commands
iotests: fix loading of common.config from tests/ subdir
iotests: add support for capturing and matching QMP events
migration: introduce a delete_snapshot wrapper
migration: wire up support for snapshot device selection
migration: control whether snapshots are ovewritten
block: rename and alter bdrv_all_find_snapshot semantics
block: allow specifying name of block device for vmstate storage
block: add ability to specify list of blockdevs during snapshot
migration: stop returning errno from load_snapshot()
migration: Make save_snapshot() return bool, not 0/-1
block: push error reporting into bdrv_all_*_snapshot functions
migration: Display the migration blockers
migration: Add blocker information
migration: Fix a few absurdly defective error messages
migration: Fix cache_init()'s "Failed to allocate" error messages
migration: Clean up signed vs. unsigned XBZRLE cache-size
migration: Fix migrate-set-parameters argument validation
migration: introduce 'userfaultfd-wrlat.py' script
...
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/exec')
| -rw-r--r-- | include/exec/memory.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/exec/memory.h b/include/exec/memory.h index c6ce74fb79..e58c09f130 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -149,6 +149,14 @@ typedef struct IOMMUTLBEvent { /* RAM is a persistent kind memory */ #define RAM_PMEM (1 << 5) + +/* + * UFFDIO_WRITEPROTECT is used on this RAMBlock to + * support 'write-tracking' migration type. + * Implies ram_state->ram_wt_enabled. + */ +#define RAM_UF_WRITEPROTECT (1 << 6) + static inline void iommu_notifier_init(IOMMUNotifier *n, IOMMUNotify fn, IOMMUNotifierFlag flags, hwaddr start, hwaddr end, |