From patchwork Wed Jan 27 06:11:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liang Li X-Patchwork-Id: 8130671 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 8B0869F38B for ; Wed, 27 Jan 2016 06:15:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 04840202E6 for ; Wed, 27 Jan 2016 06:15:54 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 470AC20279 for ; Wed, 27 Jan 2016 06:15:53 +0000 (UTC) Received: from localhost ([::1]:48263 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aOJOS-0007eg-8g for patchwork-qemu-devel@patchwork.kernel.org; Wed, 27 Jan 2016 01:15:52 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36589) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aOJOM-0007eZ-1L for qemu-devel@nongnu.org; Wed, 27 Jan 2016 01:15:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aOJOI-0004jn-S1 for qemu-devel@nongnu.org; Wed, 27 Jan 2016 01:15:45 -0500 Received: from mga02.intel.com ([134.134.136.20]:26933) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aOJOI-0004hW-L5 for qemu-devel@nongnu.org; Wed, 27 Jan 2016 01:15:42 -0500 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga101.jf.intel.com with ESMTP; 26 Jan 2016 22:15:35 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.22,353,1449561600"; d="scan'208";a="890021106" Received: from ll.sh.intel.com (HELO localhost) ([10.239.13.27]) by fmsmga001.fm.intel.com with ESMTP; 26 Jan 2016 22:15:34 -0800 From: Liang Li To: qemu-devel@nongnu.org Date: Wed, 27 Jan 2016 14:11:05 +0800 Message-Id: <1453875065-24326-1-git-send-email-liang.z.li@intel.com> X-Mailer: git-send-email 1.9.1 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.20 Cc: amit.shah@redhat.com, Liang Li , dgilbert@redhat.com, quintela@redhat.com Subject: [Qemu-devel] [PATCH] migration: remove useless code. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Since 's->state' will be set in migrate_init(), there is no need to set it before calling migrate_init(). The code and the related comments can be removed. Signed-off-by: Liang Li Reviewed-by: Fam Zheng Reviewed-by: Dr. David Alan Gilbert Reviewed-by: Amit Shah --- migration/migration.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index aaca451..ae38242 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1006,12 +1006,6 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk, return; } - /* We are starting a new migration, so we want to start in a clean - state. This change is only needed if previous migration - failed/was cancelled. We don't use migrate_set_state() because - we are setting the initial state, not changing it. */ - s->state = MIGRATION_STATUS_NONE; - s = migrate_init(¶ms); if (strstart(uri, "tcp:", &p)) {