From patchwork Wed Jun 26 00:42:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yang X-Patchwork-Id: 11016663 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 1AEEB14BB for ; Wed, 26 Jun 2019 00:43:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 095D5285E1 for ; Wed, 26 Jun 2019 00:43:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ED937285ED; Wed, 26 Jun 2019 00:43:58 +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 9E971285E1 for ; Wed, 26 Jun 2019 00:43:58 +0000 (UTC) Received: from localhost ([::1]:35954 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hfw2X-0004Om-Cd for patchwork-qemu-devel@patchwork.kernel.org; Tue, 25 Jun 2019 20:43:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47395) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hfw1X-0003xd-DN for qemu-devel@nongnu.org; Tue, 25 Jun 2019 20:42:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hfw1V-0000uz-EF for qemu-devel@nongnu.org; Tue, 25 Jun 2019 20:42:55 -0400 Received: from mga17.intel.com ([192.55.52.151]:57298) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hfw1T-0000Tt-FO for qemu-devel@nongnu.org; Tue, 25 Jun 2019 20:42:53 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 Jun 2019 17:42:37 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,417,1557212400"; d="scan'208";a="360571016" Received: from richard.sh.intel.com (HELO localhost) ([10.239.159.54]) by fmsmga006.fm.intel.com with ESMTP; 25 Jun 2019 17:42:36 -0700 From: Wei Yang To: qemu-devel@nongnu.org Date: Wed, 26 Jun 2019 08:42:11 +0800 Message-Id: <20190626004211.4822-1-richardw.yang@linux.intel.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.151 Subject: [Qemu-devel] [PATCH] migration: current_migration is never NULL 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 migration_object_init() create and assign current_migration, which means it will never be null until migration_shutdown(). Signed-off-by: Wei Yang --- migration/migration.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index 0fd2364961..43fd8297ef 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1667,10 +1667,6 @@ bool migration_is_idle(void) { MigrationState *s = current_migration; - if (!s) { - return true; - } - switch (s->state) { case MIGRATION_STATUS_NONE: case MIGRATION_STATUS_CANCELLED: