From: zhanghailiang <zhang.zhanghailiang@huawei.com>
Date: Mon, 24 Feb 2020 06:54:09 +0000 (+0800)
Subject: savevm: Don't call colo_init_ram_cache twice
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f51d0b4178738bba87d796eba7444f6cdb3aa0fd;p=qemu.git

savevm: Don't call colo_init_ram_cache twice

This helper has been called twice which is wrong.
Left the one where called while get COLO enable message
from source side.

Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---

diff --git a/migration/migration.c b/migration/migration.c
index 92272250f4..0b2045ccbd 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -489,11 +489,6 @@ static void process_incoming_migration_co(void *opaque)
             goto fail;
         }
 
-        if (colo_init_ram_cache() < 0) {
-            error_report("Init ram cache failed");
-            goto fail;
-        }
-
         qemu_thread_create(&mis->colo_incoming_thread, "COLO incoming",
              colo_process_incoming_thread, mis, QEMU_THREAD_JOINABLE);
         mis->have_colo_incoming_thread = true;