diff options
| author | Peter Maydell | 2019-09-26 15:23:58 +0200 |
|---|---|---|
| committer | Peter Maydell | 2019-09-26 15:23:58 +0200 |
| commit | eb13d1cf4a0478fc29f80abfbac8209479325f35 (patch) | |
| tree | e556d4854ffdf592440878cd8b862c3752f2759e /include | |
| parent | Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2019-09-24-v2' into... (diff) | |
| parent | migration/postcopy: Recognise the recovery states as 'in_postcopy' (diff) | |
| download | qemu-eb13d1cf4a0478fc29f80abfbac8209479325f35.tar.gz qemu-eb13d1cf4a0478fc29f80abfbac8209479325f35.tar.xz qemu-eb13d1cf4a0478fc29f80abfbac8209479325f35.zip | |
Merge remote-tracking branch 'remotes/dgilbert/tags/pull-migration-20190925a' into staging
Migration pull 2019-09-25
me: test fixes from (should stop hangs in postcopy tests).
me: An RDMA cleanup hang fix
Wei: Tidy ups around postcopy
Marc-Andre: mem leak fix
# gpg: Signature made Wed 25 Sep 2019 15:59:41 BST
# 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-20190925a:
migration/postcopy: Recognise the recovery states as 'in_postcopy'
tests/migration/postcopy: trim migration bandwidth
tests/migration: Fail on unexpected migration states
migration/rdma.c: Swap synchronize_rcu for call_rcu
migration/rdma: Don't moan about disconnects at the end
migration: remove sent parameter in get_queued_page_not_dirty
migration/postcopy: unsentmap is not necessary for postcopy
migration/postcopy: not necessary to do discard when canonicalizing bitmap
migration: fix vmdesc leak on vmstate_save() error
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/exec/ram_addr.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h index a327a80cfe..e96e621de5 100644 --- a/include/exec/ram_addr.h +++ b/include/exec/ram_addr.h @@ -44,12 +44,6 @@ struct RAMBlock { size_t page_size; /* dirty bitmap used during migration */ unsigned long *bmap; - /* bitmap of pages that haven't been sent even once - * only maintained and used in postcopy at the moment - * where it's used to send the dirtymap at the start - * of the postcopy phase - */ - unsigned long *unsentmap; /* bitmap of already received pages in postcopy */ unsigned long *receivedmap; |