[v1] Pull migration patches

[PULL 15/15] savevm: Don't call colo_init_ram_cache twice

Juan Quintela posted 15 patches 5 years, 11 months ago

Diff against v1 v1
Download mbox

Maintainers: "Alex Bennée" <alex.bennee@linaro.org>, Juan Quintela <quintela@redhat.com>, "Dr. David Alan Gilbert" <dgilbert@redhat.com>, "Philippe Mathieu-Daudé" <philmd@redhat.com>, Markus Armbruster <armbru@redhat.com>, Laurent Vivier <lvivier@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, Fam Zheng <fam@euphon.net>, Hailiang Zhang <zhang.zhanghailiang@huawei.com>, Eric Blake <eblake@redhat.com>, Thomas Huth <thuth@redhat.com>, Stefan Hajnoczi <stefanha@redhat.com>, Eduardo Habkost <ehabkost@redhat.com>, "Daniel P. Berrangé" <berrange@redhat.com>

Expand all Fold all

[PULL 15/15] savevm: Don't call colo_init_ram_cache twice

Posted by Juan Quintela 5 years, 11 months ago

From: zhanghailiang <zhang.zhanghailiang@huawei.com>

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>
---
 migration/migration.c | 5 -----
 1 file changed, 5 deletions(-)

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;
-- 
2.24.1