diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-06-15 18:13:35 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-06-15 18:13:35 +0100 |
| commit | 2ef2f16781af9dee6ba6517755e9073ba5799fa2 (patch) | |
| tree | b4e0f372f9387be4f6a84c8232c631325cd6e7fb /include/exec | |
| parent | 42747d6abb5035473e5585fa17620c1e8983a70b (diff) | |
| parent | 650af8907bd567db914b7ce3a7e9df4c323f4619 (diff) | |
Merge remote-tracking branch 'remotes/dgilbert/tags/pull-migration-20180615a' into staging
Migration pull 2018-06-15
# gpg: Signature made Fri 15 Jun 2018 16:13:17 BST
# gpg: using RSA key 0516331EBC5BFDE7
# gpg: Good signature from "Dr. David Alan Gilbert (RH2) <dgilbert@redhat.com>"
# Primary key fingerprint: 45F5 C71B 4A0C B7FB 977A 9FA9 0516 331E BC5B FDE7
* remotes/dgilbert/tags/pull-migration-20180615a:
migration: calculate expected_downtime with ram_bytes_remaining()
migration/postcopy: Wake rate limit sleep on postcopy request
migration: Wake rate limiting for urgent requests
migration/postcopy: Add max-postcopy-bandwidth parameter
migration: introduce migration_update_rates
migration: fix counting xbzrle cache_miss_rate
migration/block-dirty-bitmap: fix dirty_bitmap_load
migration: Poison ramblock loops in migration
migration: Fixes for non-migratable RAMBlocks
typedefs: add QJSON
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/exec')
| -rw-r--r-- | include/exec/ramlist.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/exec/ramlist.h b/include/exec/ramlist.h index 2e2ac6cb99..bc4faa1b00 100644 --- a/include/exec/ramlist.h +++ b/include/exec/ramlist.h @@ -56,8 +56,10 @@ typedef struct RAMList { extern RAMList ram_list; /* Should be holding either ram_list.mutex, or the RCU lock. */ -#define RAMBLOCK_FOREACH(block) \ +#define INTERNAL_RAMBLOCK_FOREACH(block) \ QLIST_FOREACH_RCU(block, &ram_list.blocks, next) +/* Never use the INTERNAL_ version except for defining other macros */ +#define RAMBLOCK_FOREACH(block) INTERNAL_RAMBLOCK_FOREACH(block) void qemu_mutex_lock_ramlist(void); void qemu_mutex_unlock_ramlist(void); |