aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDr. David Alan Gilbert <dgilbert@redhat.com>2015-11-11 14:02:28 +0000
committerJuan Quintela <quintela@redhat.com>2015-11-12 17:52:29 +0100
commita3b6ff6d0a7a964c5c7cd5f9a0d5e42752b6347a (patch)
tree05090e04221a5042cc8ddfb6c8cd41f42898b2a2
parent1c0d249ddf3c75c3992847d0af67f79a1cfd23d2 (diff)
Postcopy: Fix TP!=HP zero case
Where the target page size is different from the host page we special case it, but I messed up on the zero case check. Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com> Reviewed-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Juan Quintela <quintela@redhat.com>
-rw-r--r--migration/ram.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/migration/ram.c b/migration/ram.c
index d8d5a50bff..7f32696d79 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -2274,6 +2274,7 @@ static int ram_load_postcopy(QEMUFile *f)
/* Temporary page that is later 'placed' */
void *postcopy_host_page = postcopy_get_tmp_page(mis);
void *last_host = NULL;
+ bool all_zero = false;
while (!ret && !(flags & RAM_SAVE_FLAG_EOS)) {
ram_addr_t addr;
@@ -2281,7 +2282,6 @@ static int ram_load_postcopy(QEMUFile *f)
void *page_buffer = NULL;
void *place_source = NULL;
uint8_t ch;
- bool all_zero = false;
addr = qemu_get_be64(f);
flags = addr & ~TARGET_PAGE_MASK;