From nobody Sun Feb 8 07:48:46 2026 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=1563776721; cv=none; d=zoho.com; s=zohoarc; b=UXhYGHIJNHeYpIPBL892IJCfSttT6C2zw1aIAUuG/p2RTjYGNL4HlHwnGevOlD9e2OLzhBFnuBV0oH7HV5E45EDESX8OQSzA55KKeBUezWsaQy/5RjzWpCZrjbHmLzv5fBNzvnGOEy8hvnL8Ox2TAkrlPYbiijqlhMim2XMDUXA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563776721; 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=OJDJ+Zo0apgxnOMc2ivZRNr5BYfefqyhl5+2hy/cn5w=; b=UeCgQxZCm807KV8ICPmdn+XT/RLhi9BoATLQbKqZuCLrGzfEek+a6ySzPk8FPvkXkIIo1np8rkgIIQ9oSizcETA3+bNBad4DeIpk4qlfONHk5xdVjxGPvjzoZtJGrSjZxGmOerX4TXM4bt8oQe+78LCaGHVS1ooQJiLZIUTHaYo= 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 1563776721384953.0705179287639; Sun, 21 Jul 2019 23:25:21 -0700 (PDT) Received: from localhost ([::1]:59104 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpRl5-0004rR-1W for importer@patchew.org; Mon, 22 Jul 2019 02:25:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34170) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpRkv-0004Sv-5k for qemu-devel@nongnu.org; Mon, 22 Jul 2019 02:25:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hpRku-0004fV-48 for qemu-devel@nongnu.org; Mon, 22 Jul 2019 02:25:05 -0400 Received: from mga03.intel.com ([134.134.136.65]:65115) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hpRkt-0004e7-Sm for qemu-devel@nongnu.org; Mon, 22 Jul 2019 02:25:04 -0400 Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 Jul 2019 23:25:01 -0700 Received: from richard.sh.intel.com (HELO localhost) ([10.239.159.54]) by FMSMGA003.fm.intel.com with ESMTP; 21 Jul 2019 23:25:00 -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,294,1559545200"; d="scan'208";a="176902484" From: Wei Yang To: qemu-devel@nongnu.org Date: Mon, 22 Jul 2019 14:24:35 +0800 Message-Id: <20190722062435.2518-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/multifd: multifd_load_cleanup() always return 0 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" multifd_load_cleanup() always return 0 and never use the errp, just cleanup a little. Signed-off-by: Wei Yang --- migration/migration.c | 9 ++------- migration/ram.c | 7 +++---- migration/ram.h | 2 +- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index 27ca10122f..38d2fdfa73 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -399,10 +399,7 @@ static void process_incoming_migration_bh(void *opaque) */ qemu_announce_self(&mis->announce_timer, migrate_announce_params()); =20 - if (multifd_load_cleanup(&local_err) !=3D 0) { - error_report_err(local_err); - autostart =3D false; - } + multifd_load_cleanup(); /* If global state section was not received or we are in running state, we need to obey autostart. Any other state is set with runstate_set. */ @@ -506,9 +503,7 @@ fail: migrate_set_state(&mis->state, MIGRATION_STATUS_ACTIVE, MIGRATION_STATUS_FAILED); qemu_fclose(mis->from_src_file); - if (multifd_load_cleanup(&local_err) !=3D 0) { - error_report_err(local_err); - } + multifd_load_cleanup(); exit(EXIT_FAILURE); } =20 diff --git a/migration/ram.c b/migration/ram.c index 66792568e2..7d30f8484c 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -1243,13 +1243,12 @@ static void multifd_recv_terminate_threads(Error *e= rr) } } =20 -int multifd_load_cleanup(Error **errp) +void multifd_load_cleanup(void) { int i; - int ret =3D 0; =20 if (!migrate_use_multifd()) { - return 0; + return; } multifd_recv_terminate_threads(NULL); for (i =3D 0; i < migrate_multifd_channels(); i++) { @@ -1276,7 +1275,7 @@ int multifd_load_cleanup(Error **errp) g_free(multifd_recv_state); multifd_recv_state =3D NULL; =20 - return ret; + return; } =20 static void multifd_recv_sync_main(void) diff --git a/migration/ram.h b/migration/ram.h index e0a499b956..6fdd449899 100644 --- a/migration/ram.h +++ b/migration/ram.h @@ -44,7 +44,7 @@ uint64_t ram_bytes_total(void); int multifd_save_setup(void); void multifd_save_cleanup(void); int multifd_load_setup(void); -int multifd_load_cleanup(Error **errp); +void multifd_load_cleanup(void); bool multifd_recv_all_channels_created(void); bool multifd_recv_new_channel(QIOChannel *ioc, Error **errp); =20 --=20 2.17.1