From patchwork Wed Jul 24 01:32:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yang X-Patchwork-Id: 11055497 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 96C29138D for ; Wed, 24 Jul 2019 01:32:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 86C6B2862A for ; Wed, 24 Jul 2019 01:32:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 79E2C28658; Wed, 24 Jul 2019 01:32:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 10CE12862A for ; Wed, 24 Jul 2019 01:32:51 +0000 (UTC) Received: from localhost ([::1]:48156 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hq69C-0000KG-OV for patchwork-qemu-devel@patchwork.kernel.org; Tue, 23 Jul 2019 21:32:50 -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 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False 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 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,300,1559545200"; d="scan'208";a="163689033" 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 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 = migration_incoming_get_current(); QEMUFile *f = mis->from_src_file; + Error *local_err = NULL; int load_res; 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) != 0) { + error_report_err(local_err); + } rcu_unregister_thread(); postcopy_state_set(POSTCOPY_INCOMING_END, NULL);