{"id":807497,"url":"http://patchwork.ozlabs.org/api/1.0/patches/807497/?format=json","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.0/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<1504081950-2528-16-git-send-email-peterx@redhat.com>","date":"2017-08-30T08:32:12","name":"[RFC,v2,15/33] migration: pass MigrationState to migrate_init()","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"7fb563a3449b4d2d25f886c3233f0a09dfb5a958","submitter":{"id":67717,"url":"http://patchwork.ozlabs.org/api/1.0/people/67717/?format=json","name":"Peter Xu","email":"peterx@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1504081950-2528-16-git-send-email-peterx@redhat.com/mbox/","series":[{"id":552,"url":"http://patchwork.ozlabs.org/api/1.0/series/552/?format=json","date":"2017-08-30T08:31:59","name":"Migration: postcopy failure recovery","version":2,"mbox":"http://patchwork.ozlabs.org/series/552/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/807497/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx09.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx09.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=peterx@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xhzWp17fXz9t1t\n\tfor ;\n\tWed, 30 Aug 2017 18:41:58 +1000 (AEST)","from localhost ([::1]:49052 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dmyZP-0005mo-R4\n\tfor incoming@patchwork.ozlabs.org; Wed, 30 Aug 2017 04:41:55 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:34334)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dmyRV-0007Ud-AF\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 04:33:46 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dmyRU-0003UZ-Fs\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 04:33:45 -0400","from mx1.redhat.com ([209.132.183.28]:49192)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dmyRU-0003U9-8t\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 04:33:44 -0400","from smtp.corp.redhat.com\n\t(int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 2F8F84A707;\n\tWed, 30 Aug 2017 08:33:43 +0000 (UTC)","from pxdev.xzpeter.org.com (dhcp-14-103.nay.redhat.com\n\t[10.66.14.103])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 422BB8479A;\n\tWed, 30 Aug 2017 08:33:37 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 2F8F84A707","From":"Peter Xu ","To":"qemu-devel@nongnu.org","Date":"Wed, 30 Aug 2017 16:32:12 +0800","Message-Id":"<1504081950-2528-16-git-send-email-peterx@redhat.com>","In-Reply-To":"<1504081950-2528-1-git-send-email-peterx@redhat.com>","References":"<1504081950-2528-1-git-send-email-peterx@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.15","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.38]);\n\tWed, 30 Aug 2017 08:33:43 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [RFC v2 15/33] migration: pass MigrationState to\n\tmigrate_init()","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Laurent Vivier ,\n\tAndrea Arcangeli , \n\tJuan Quintela ,\n\tAlexey Perevalov , peterx@redhat.com,\n\t\"Dr . David Alan Gilbert\" ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Let the callers take the object, then pass it to migrate_init().\n\nSigned-off-by: Peter Xu \n---\n migration/migration.c | 7 ++-----\n migration/migration.h | 2 +-\n migration/savevm.c | 5 ++++-\n 3 files changed, 7 insertions(+), 7 deletions(-)","diff":"diff --git a/migration/migration.c b/migration/migration.c\nindex 394e84b..15b8eb1 100644\n--- a/migration/migration.c\n+++ b/migration/migration.c\n@@ -1138,10 +1138,8 @@ bool migration_is_idle(void)\n return false;\n }\n \n-MigrationState *migrate_init(void)\n+void migrate_init(MigrationState *s)\n {\n- MigrationState *s = migrate_get_current();\n-\n /*\n * Reinitialise all migration state, except\n * parameters/capabilities that the user set, and\n@@ -1169,7 +1167,6 @@ MigrationState *migrate_init(void)\n migrate_set_state(&s->state, MIGRATION_STATUS_NONE, MIGRATION_STATUS_SETUP);\n \n s->total_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME);\n- return s;\n }\n \n static GSList *migration_blockers;\n@@ -1277,7 +1274,7 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk,\n migrate_set_block_incremental(s, true);\n }\n \n- s = migrate_init();\n+ migrate_init(s);\n \n if (strstart(uri, \"tcp:\", &p)) {\n tcp_start_outgoing_migration(s, p, &local_err);\ndiff --git a/migration/migration.h b/migration/migration.h\nindex 338dfe3..b78b9bd 100644\n--- a/migration/migration.h\n+++ b/migration/migration.h\n@@ -169,7 +169,7 @@ void migrate_fd_error(MigrationState *s, const Error *error);\n \n void migrate_fd_connect(MigrationState *s);\n \n-MigrationState *migrate_init(void);\n+void migrate_init(MigrationState *s);\n bool migration_is_blocked(Error **errp);\n /* True if outgoing migration has entered postcopy phase */\n bool migration_in_postcopy(void);\ndiff --git a/migration/savevm.c b/migration/savevm.c\nindex a3162c1..c9bccf7 100644\n--- a/migration/savevm.c\n+++ b/migration/savevm.c\n@@ -1224,8 +1224,11 @@ void qemu_savevm_state_cleanup(void)\n static int qemu_savevm_state(QEMUFile *f, Error **errp)\n {\n int ret;\n- MigrationState *ms = migrate_init();\n+ MigrationState *ms = migrate_get_current();\n MigrationStatus status;\n+\n+ migrate_init(ms);\n+\n ms->to_dst_file = f;\n \n if (migration_is_blocked(errp)) {\n","prefixes":["RFC","v2","15/33"]}