diff options
| author | Juan Quintela | 2017-03-22 15:18:04 +0100 |
|---|---|---|
| committer | Juan Quintela | 2017-05-04 10:00:38 +0200 |
| commit | 6b6712efccd383b48a909bee0b29e079a57601ec (patch) | |
| tree | d9d71f7dce54e59bd0c9e1b5ef9fc9d876603880 /include/migration | |
| parent | Merge remote-tracking branch 'sthibault/tags/samuel-thibault' into staging (diff) | |
| download | qemu-6b6712efccd383b48a909bee0b29e079a57601ec.tar.gz qemu-6b6712efccd383b48a909bee0b29e079a57601ec.tar.xz qemu-6b6712efccd383b48a909bee0b29e079a57601ec.zip | |
ram: Split dirty bitmap by RAMBlock
Both the ram bitmap and the unsent bitmap are split by RAMBlock.
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
--
Fix compilation when DEBUG_POSTCOPY is enabled (thanks Hailiang)
Diffstat (limited to 'include/migration')
| -rw-r--r-- | include/migration/migration.h | 3 | ||||
| -rw-r--r-- | include/migration/postcopy-ram.h | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/include/migration/migration.h b/include/migration/migration.h index ba1a16cbc1..e29cb0144b 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -266,7 +266,8 @@ uint64_t xbzrle_mig_pages_cache_miss(void); double xbzrle_mig_cache_miss_rate(void); void ram_handle_compressed(void *host, uint8_t ch, uint64_t size); -void ram_debug_dump_bitmap(unsigned long *todump, bool expected); +void ram_debug_dump_bitmap(unsigned long *todump, bool expected, + unsigned long pages); /* For outgoing discard bitmap */ int ram_postcopy_send_discard_bitmap(MigrationState *ms); /* For incoming postcopy discard */ diff --git a/include/migration/postcopy-ram.h b/include/migration/postcopy-ram.h index 8e036b95a2..4c25f03be2 100644 --- a/include/migration/postcopy-ram.h +++ b/include/migration/postcopy-ram.h @@ -43,12 +43,9 @@ int postcopy_ram_prepare_discard(MigrationIncomingState *mis); /* * Called at the start of each RAMBlock by the bitmap code. - * 'offset' is the bitmap offset of the named RAMBlock in the migration - * bitmap. * Returns a new PDS */ PostcopyDiscardState *postcopy_discard_send_init(MigrationState *ms, - unsigned long offset, const char *name); /* |