From nobody Mon Feb 9 02:27:47 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1518086594659723.6259847266297; Thu, 8 Feb 2018 02:43:14 -0800 (PST) Received: from localhost ([::1]:41133 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ejjfc-0007Sx-QX for importer@patchew.org; Thu, 08 Feb 2018 05:43:12 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37069) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ejjUy-0006bF-Nh for qemu-devel@nongnu.org; Thu, 08 Feb 2018 05:32:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ejjUx-0005aV-No for qemu-devel@nongnu.org; Thu, 08 Feb 2018 05:32:12 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:59248 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ejjUx-0005aL-Ib for qemu-devel@nongnu.org; Thu, 08 Feb 2018 05:32:11 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 36804406F881; Thu, 8 Feb 2018 10:32:11 +0000 (UTC) Received: from xz-mi.nay.redhat.com (dhcp-14-120.nay.redhat.com [10.66.14.120]) by smtp.corp.redhat.com (Postfix) with ESMTP id 90A712166BAE; Thu, 8 Feb 2018 10:32:08 +0000 (UTC) From: Peter Xu To: qemu-devel@nongnu.org Date: Thu, 8 Feb 2018 18:31:15 +0800 Message-Id: <20180208103132.28452-12-peterx@redhat.com> In-Reply-To: <20180208103132.28452-1-peterx@redhat.com> References: <20180208103132.28452-1-peterx@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Thu, 08 Feb 2018 10:32:11 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Thu, 08 Feb 2018 10:32:11 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'peterx@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH v6 11/28] migration: pass MigrationState to migrate_init() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrea Arcangeli , Juan Quintela , Alexey Perevalov , peterx@redhat.com, "Dr . David Alan Gilbert" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Let the callers take the object, then pass it to migrate_init(). Reviewed-by: Dr. David Alan Gilbert Signed-off-by: Peter Xu --- migration/migration.c | 7 ++----- migration/migration.h | 2 +- migration/savevm.c | 5 ++++- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index dbcc3f6296..37b7170c20 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1260,10 +1260,8 @@ bool migration_is_idle(void) return false; } =20 -MigrationState *migrate_init(void) +void migrate_init(MigrationState *s) { - MigrationState *s =3D migrate_get_current(); - /* * Reinitialise all migration state, except * parameters/capabilities that the user set, and @@ -1293,7 +1291,6 @@ MigrationState *migrate_init(void) s->vm_was_running =3D false; s->iteration_initial_bytes =3D 0; s->threshold_size =3D 0; - return s; } =20 static GSList *migration_blockers; @@ -1401,7 +1398,7 @@ void qmp_migrate(const char *uri, bool has_blk, bool = blk, migrate_set_block_incremental(s, true); } =20 - s =3D migrate_init(); + migrate_init(s); =20 if (strstart(uri, "tcp:", &p)) { tcp_start_outgoing_migration(s, p, &local_err); diff --git a/migration/migration.h b/migration/migration.h index c39e325615..9e3ddb0b06 100644 --- a/migration/migration.h +++ b/migration/migration.h @@ -202,7 +202,7 @@ void migrate_fd_error(MigrationState *s, const Error *e= rror); =20 void migrate_fd_connect(MigrationState *s, Error *error_in); =20 -MigrationState *migrate_init(void); +void migrate_init(MigrationState *s); bool migration_is_blocked(Error **errp); /* True if outgoing migration has entered postcopy phase */ bool migration_in_postcopy(void); diff --git a/migration/savevm.c b/migration/savevm.c index 5b1a0a7fe1..4a75e66aab 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -1256,8 +1256,11 @@ void qemu_savevm_state_cleanup(void) static int qemu_savevm_state(QEMUFile *f, Error **errp) { int ret; - MigrationState *ms =3D migrate_init(); + MigrationState *ms =3D migrate_get_current(); MigrationStatus status; + + migrate_init(ms); + ms->to_dst_file =3D f; =20 if (migration_is_blocked(errp)) { --=20 2.14.3