[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 08/12] migration/ram: Consolidate variable reset after placement i
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[PULL 08/12] migration/ram: Consolidate variable reset after placement in ram_load_postcopy() |
Date: |
Thu, 7 May 2020 18:02:07 +0100 |
From: David Hildenbrand <address@hidden>
Let's consolidate resetting the variables.
Cc: "Dr. David Alan Gilbert" <address@hidden>
Cc: Juan Quintela <address@hidden>
Cc: Peter Xu <address@hidden>
Signed-off-by: David Hildenbrand <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Fixup for context conflicts with 91ba442
---
migration/ram.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index 52fc032b83..08eb382f53 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -3147,7 +3147,7 @@ static int ram_load_postcopy(QEMUFile *f)
/* Temporary page that is later 'placed' */
void *postcopy_host_page = mis->postcopy_tmp_page;
void *this_host = NULL;
- bool all_zero = false;
+ bool all_zero = true;
int target_pages = 0;
while (!ret && !(flags & RAM_SAVE_FLAG_EOS)) {
@@ -3174,7 +3174,6 @@ static int ram_load_postcopy(QEMUFile *f)
addr &= TARGET_PAGE_MASK;
trace_ram_load_postcopy_loop((uint64_t)addr, flags);
- place_needed = false;
if (flags & (RAM_SAVE_FLAG_ZERO | RAM_SAVE_FLAG_PAGE |
RAM_SAVE_FLAG_COMPRESS_PAGE)) {
block = ram_block_from_stream(f, flags);
@@ -3199,9 +3198,7 @@ static int ram_load_postcopy(QEMUFile *f)
*/
page_buffer = postcopy_host_page +
((uintptr_t)host & (block->page_size - 1));
- /* If all TP are zero then we can optimise the place */
if (target_pages == 1) {
- all_zero = true;
this_host = (void *)QEMU_ALIGN_DOWN((uintptr_t)host,
block->page_size);
} else {
@@ -3221,7 +3218,6 @@ static int ram_load_postcopy(QEMUFile *f)
*/
if (target_pages == (block->page_size / TARGET_PAGE_SIZE)) {
place_needed = true;
- target_pages = 0;
}
place_source = postcopy_host_page;
}
@@ -3303,6 +3299,10 @@ static int ram_load_postcopy(QEMUFile *f)
ret = postcopy_place_page(mis, place_dest,
place_source, block);
}
+ place_needed = false;
+ target_pages = 0;
+ /* Assume we have a zero page until we detect something different
*/
+ all_zero = true;
}
}
--
2.26.2
- [PULL 00/12] migration queue, Dr. David Alan Gilbert (git), 2020/05/07
- [PULL 03/12] monitor/hmp-cmds: add hmp_handle_error() for hmp_migrate_set_speed(), Dr. David Alan Gilbert (git), 2020/05/07
- [PULL 04/12] migration: move the units of migrate parameters from milliseconds to ms, Dr. David Alan Gilbert (git), 2020/05/07
- [PULL 01/12] migration: fix bad indentation in error_report(), Dr. David Alan Gilbert (git), 2020/05/07
- [PULL 02/12] migration/migration: improve error reporting for migrate parameters, Dr. David Alan Gilbert (git), 2020/05/07
- [PULL 06/12] migration/colo: Add missing error-propagation code, Dr. David Alan Gilbert (git), 2020/05/07
- [PULL 05/12] docs/devel/migration: start a debugging section, Dr. David Alan Gilbert (git), 2020/05/07
- [PULL 07/12] migration/throttle: Add cpu-throttle-tailslow migration parameter, Dr. David Alan Gilbert (git), 2020/05/07
- [PULL 08/12] migration/ram: Consolidate variable reset after placement in ram_load_postcopy(),
Dr. David Alan Gilbert (git) <=
- [PULL 09/12] migration/rdma: fix a memleak on error path in rdma_start_incoming_migration, Dr. David Alan Gilbert (git), 2020/05/07
- [PULL 10/12] migration/xbzrle: add encoding rate, Dr. David Alan Gilbert (git), 2020/05/07
- [PULL 11/12] migration/multifd: fix memleaks in multifd_new_send_channel_async, Dr. David Alan Gilbert (git), 2020/05/07
- [PULL 12/12] migration/multifd: Do error_free after migrate_set_error to avoid memleaks, Dr. David Alan Gilbert (git), 2020/05/07
- Re: [PULL 00/12] migration queue, Peter Maydell, 2020/05/07