From nobody Tue Feb 10 00:25:13 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1505454433552803.0936171585039; Thu, 14 Sep 2017 22:47:13 -0700 (PDT) Received: from localhost ([::1]:51420 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dsjT6-0003gY-V9 for importer@patchew.org; Fri, 15 Sep 2017 01:47:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50397) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dsjQJ-0000Zn-V7 for qemu-devel@nongnu.org; Fri, 15 Sep 2017 01:44:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dsjQJ-0007O9-24 for qemu-devel@nongnu.org; Fri, 15 Sep 2017 01:44:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44644) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dsjQI-0007Nx-RU; Fri, 15 Sep 2017 01:44:18 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D707287649; Fri, 15 Sep 2017 05:44:17 +0000 (UTC) Received: from lemon.redhat.com (ovpn-12-95.pek2.redhat.com [10.72.12.95]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8E64069555; Fri, 15 Sep 2017 05:44:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com D707287649 Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=famz@redhat.com From: Fam Zheng To: qemu-devel@nongnu.org Date: Fri, 15 Sep 2017 13:44:03 +0800 Message-Id: <20170915054404.19914-3-famz@redhat.com> In-Reply-To: <20170915054404.19914-1-famz@redhat.com> References: <20170915054404.19914-1-famz@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Fri, 15 Sep 2017 05:44:18 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 2/3] migration: Cancel migration at exit 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: qemu-stable@nongnu.org, "Dr. David Alan Gilbert" , peterx@redhat.com, Juan Quintela 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" bdrv_close_all() would abort() due to op blockers added by BMDS, clean up migration states when main loop quits to avoid that. Signed-off-by: Fam Zheng --- include/migration/misc.h | 1 + migration/migration.c | 7 ++++++- vl.c | 3 +++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/include/migration/misc.h b/include/migration/misc.h index c079b7771b..b9a26b0898 100644 --- a/include/migration/misc.h +++ b/include/migration/misc.h @@ -54,5 +54,6 @@ bool migration_has_failed(MigrationState *); /* ...and after the device transmission */ bool migration_in_postcopy_after_devices(MigrationState *); void migration_global_dump(Monitor *mon); +void migrate_cancel(void); =20 #endif diff --git a/migration/migration.c b/migration/migration.c index 959e8ec88e..2c844945c7 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1274,11 +1274,16 @@ void qmp_migrate(const char *uri, bool has_blk, boo= l blk, } } =20 -void qmp_migrate_cancel(Error **errp) +void migrate_cancel(void) { migrate_fd_cancel(migrate_get_current()); } =20 +void qmp_migrate_cancel(Error **errp) +{ + migrate_cancel(); +} + void qmp_migrate_set_cache_size(int64_t value, Error **errp) { MigrationState *s =3D migrate_get_current(); diff --git a/vl.c b/vl.c index fb1f05b937..abbe61f40b 100644 --- a/vl.c +++ b/vl.c @@ -87,6 +87,7 @@ int main(int argc, char **argv) #include "sysemu/blockdev.h" #include "hw/block/block.h" #include "migration/misc.h" +#include "migration/savevm.h" #include "migration/snapshot.h" #include "migration/global_state.h" #include "sysemu/tpm.h" @@ -4799,6 +4800,8 @@ int main(int argc, char **argv, char **envp) iothread_stop_all(); =20 pause_all_vcpus(); + migrate_cancel(); + qemu_savevm_state_cleanup(); bdrv_close_all(); res_free(); =20 --=20 2.13.5