From nobody Mon May 20 00:09:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linux.intel.com ARC-Seal: i=1; a=rsa-sha256; t=1563931983; cv=none; d=zoho.com; s=zohoarc; b=jodaqFDrXuvwPkMYyFSUVDEWSUHIgHWpE1mjYSxej7FqX0Y2nGdwmT2kYr6nrXOqaGcGZWHlvLX1S7KlHZwtyGYvARNFzdhM9uLutmh7wMhlm8TDaCst5vyDF2G/N9WZiGTvJya47uhiTBqVOsa71DZ9i3Y+XiWYWUcQ0+yezW4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563931983; h=Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=Zq+KC4b1aYTlnFafP4nGP3FeqWISPF2JL9qnkurWxl4=; b=geXpk7SFoKh62/+p8MubdgeCTt0v9rLZlpihAtcELJvyNcqMcE/vB3dcpnm+NiViTa6naH1WG3AepwHceK73J1PfQJr+GdRX9iDkBtQ454rhm6jnEu6Gt8b4Ih+R0dt66upbjZ/a4A3dXLohkb04YkytzVovwajNiNzuBwYGUrI= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1563931983458610.3508211195765; Tue, 23 Jul 2019 18:33:03 -0700 (PDT) Received: from localhost ([::1]:48156 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hq69G-0000KG-Uz for importer@patchew.org; Tue, 23 Jul 2019 21:32:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39807) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hq693-0008ND-4d for qemu-devel@nongnu.org; Tue, 23 Jul 2019 21:32:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hq692-0003s0-6B for qemu-devel@nongnu.org; Tue, 23 Jul 2019 21:32:41 -0400 Received: from mga03.intel.com ([134.134.136.65]:37673) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hq691-0003qA-UT for qemu-devel@nongnu.org; Tue, 23 Jul 2019 21:32:40 -0400 Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 23 Jul 2019 18:32:38 -0700 Received: from richard.sh.intel.com (HELO localhost) ([10.239.159.54]) by orsmga008.jf.intel.com with ESMTP; 23 Jul 2019 18:32:35 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,300,1559545200"; d="scan'208";a="163689033" From: Wei Yang To: qemu-devel@nongnu.org Date: Wed, 24 Jul 2019 09:32:08 +0800 Message-Id: <20190724013208.5893-1-richardw.yang@linux.intel.com> X-Mailer: git-send-email 2.17.1 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.65 Subject: [Qemu-devel] [PATCH] migration/postcopy: cleanup multifd after postcopy finish X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Wei Yang , dgilbert@redhat.com, quintela@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" In case we enable multifd, not forget to cleanup it. Signed-off-by: Wei Yang --- migration/savevm.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/migration/savevm.c b/migration/savevm.c index 0105068579..27eef72c9d 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -1738,6 +1738,7 @@ static void *postcopy_ram_listen_thread(void *opaque) { MigrationIncomingState *mis =3D migration_incoming_get_current(); QEMUFile *f =3D mis->from_src_file; + Error *local_err =3D NULL; int load_res; =20 migrate_set_state(&mis->state, MIGRATION_STATUS_ACTIVE, @@ -1800,6 +1801,9 @@ static void *postcopy_ram_listen_thread(void *opaque) */ migration_incoming_state_destroy(); qemu_loadvm_state_cleanup(); + if (multifd_load_cleanup(&local_err) !=3D 0) { + error_report_err(local_err); + } =20 rcu_unregister_thread(); postcopy_state_set(POSTCOPY_INCOMING_END, NULL); --=20 2.17.1