From bf03ba87d891a3f0f2aad8d05b5770c1ac09e800 Mon Sep 17 00:00:00 2001 From: Amit Shah Date: Fri, 21 Nov 2014 08:27:51 +0100 Subject: [PATCH 1/7] migration: static variables will not be reset at second migration Message-id: <20e4d11148c43174056cdd0e3be03480fe51ccc7.1416557860.git.amit.shah@redhat.com> Patchwork-id: 62517 O-Subject: [RHEL-7.1 qemu-kvm PATCH 1/1] migration: static variables will not be reset at second migration Bugzilla: 1071776 RH-Acked-by: Dr. David Alan Gilbert (git) RH-Acked-by: Laszlo Ersek RH-Acked-by: Paolo Bonzini From: ChenLiang The static variables in migration_bitmap_sync will not be reset in the case of a second attempted migration. Signed-off-by: ChenLiang Signed-off-by: Gonglei Reviewed-by: Dr. David Alan Gilbert Signed-off-by: Amit Shah (cherry picked from commit 6c1b663c4c3725bc4bc33f78ed266ddef80a2ca8) Signed-off-by: Amit Shah Signed-off-by: Miroslav Rezanina Conflicts: arch_init.c (Trivial context conflict) --- arch_init.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/arch_init.c b/arch_init.c index b88d686..0c2bde9 100644 --- a/arch_init.c +++ b/arch_init.c @@ -476,15 +476,23 @@ static void migration_bitmap_sync_range(ram_addr_t start, ram_addr_t length) /* Needs iothread lock! */ +/* Fix me: there are too many global variables used in migration process. */ +static int64_t start_time; +static int64_t bytes_xfer_prev; +static int64_t num_dirty_pages_period; + +static void migration_bitmap_sync_init(void) +{ + start_time = 0; + bytes_xfer_prev = 0; + num_dirty_pages_period = 0; +} static void migration_bitmap_sync(void) { RAMBlock *block; uint64_t num_dirty_pages_init = migration_dirty_pages; MigrationState *s = migrate_get_current(); - static int64_t start_time; - static int64_t bytes_xfer_prev; - static int64_t num_dirty_pages_period; int64_t end_time; int64_t bytes_xfer_now; @@ -732,6 +740,7 @@ static int ram_save_setup(QEMUFile *f, void *opaque) mig_throttle_on = false; dirty_rate_high_cnt = 0; + migration_bitmap_sync_init(); if (migrate_use_xbzrle()) { XBZRLE_cache_lock(); -- 1.8.3.1