From patchwork Mon Jul 22 06:24:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yang X-Patchwork-Id: 1134736 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.intel.com Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45sWn668MKz9s7T for ; Mon, 22 Jul 2019 16:25:13 +1000 (AEST) Received: from localhost ([::1]:59102 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpRl0-0004TG-CA for incoming@patchwork.ozlabs.org; Mon, 22 Jul 2019 02:25:10 -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 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False 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 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,294,1559545200"; d="scan'208";a="176902484" 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 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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()); - if (multifd_load_cleanup(&local_err) != 0) { - error_report_err(local_err); - autostart = 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) != 0) { - error_report_err(local_err); - } + multifd_load_cleanup(); exit(EXIT_FAILURE); } 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 *err) } } -int multifd_load_cleanup(Error **errp) +void multifd_load_cleanup(void) { int i; - int ret = 0; if (!migrate_use_multifd()) { - return 0; + return; } multifd_recv_terminate_threads(NULL); for (i = 0; i < migrate_multifd_channels(); i++) { @@ -1276,7 +1275,7 @@ int multifd_load_cleanup(Error **errp) g_free(multifd_recv_state); multifd_recv_state = NULL; - return ret; + return; } 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);