diff options
| author | Wei Yang | 2019-08-19 08:18:41 +0200 |
|---|---|---|
| committer | Dr. David Alan Gilbert | 2019-09-25 16:51:19 +0200 |
| commit | 8324ef86f004b1224844267d1fbbf4a80a54207d (patch) | |
| tree | 65839a17cf4c8c6e8ae7bc3726abc991833bc7e9 /migration/ram.c | |
| parent | migration: fix vmdesc leak on vmstate_save() error (diff) | |
| download | qemu-8324ef86f004b1224844267d1fbbf4a80a54207d.tar.gz qemu-8324ef86f004b1224844267d1fbbf4a80a54207d.tar.xz qemu-8324ef86f004b1224844267d1fbbf4a80a54207d.zip | |
migration/postcopy: not necessary to do discard when canonicalizing bitmap
All pages, either partially sent or partially dirty, will be discarded in
postcopy_send_discard_bm_ram(), since we update the unsentmap to be
unsentmap = unsentmap | dirty in ram_postcopy_send_discard_bitmap().
This is not necessary to do discard when canonicalizing bitmap. And by
doing so, we separate the page discard into two individual steps:
* canonicalize bitmap
* discard page
Signed-off-by: Wei Yang <richardw.yang@linux.intel.com>
Message-Id: <20190819061843.28642-2-richardw.yang@linux.intel.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Diffstat (limited to 'migration/ram.c')
| -rw-r--r-- | migration/ram.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/migration/ram.c b/migration/ram.c index 01df326767..57d1a4627e 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -2928,7 +2928,7 @@ static int postcopy_each_ram_send_discard(MigrationState *ms) } /** - * postcopy_chunk_hostpages_pass: canocalize bitmap in hostpages + * postcopy_chunk_hostpages_pass: canonicalize bitmap in hostpages * * Helper for postcopy_chunk_hostpages; it's called twice to * canonicalize the two bitmaps, that are similar, but one is @@ -2991,18 +2991,6 @@ static void postcopy_chunk_hostpages_pass(MigrationState *ms, bool unsent_pass, host_ratio); run_start = QEMU_ALIGN_UP(run_start, host_ratio); - /* Tell the destination to discard this page */ - if (unsent_pass || !test_bit(fixup_start_addr, unsentmap)) { - /* For the unsent_pass we: - * discard partially sent pages - * For the !unsent_pass (dirty) we: - * discard partially dirty pages that were sent - * (any partially sent pages were already discarded - * by the previous unsent_pass) - */ - postcopy_discard_send_range(ms, fixup_start_addr, host_ratio); - } - /* Clean up the bitmap */ for (page = fixup_start_addr; page < fixup_start_addr + host_ratio; page++) { |