From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:57449) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJ6Ab-0003TN-MV for qemu-devel@nongnu.org; Tue, 23 Apr 2019 20:53:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hJ64V-0008VE-Pd for qemu-devel@nongnu.org; Tue, 23 Apr 2019 20:47:36 -0400 Received: from mga18.intel.com ([134.134.136.126]:13718) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hJ64V-0008TP-Hn for qemu-devel@nongnu.org; Tue, 23 Apr 2019 20:47:35 -0400 From: Wei Yang Date: Wed, 24 Apr 2019 08:46:58 +0800 Message-Id: <20190424004700.12766-3-richardw.yang@linux.intel.com> In-Reply-To: <20190424004700.12766-1-richardw.yang@linux.intel.com> References: <20190424004700.12766-1-richardw.yang@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH 2/4] migration/savevm: use migration_is_blocked to validate List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: quintela@redhat.com, dgilbert@redhat.com, Wei Yang migration_is_blocked() is used in migrate_prepare() and save_snapshot(), this is more proper to use this instead of qemu_savevm_state_blocked() in qemu_loadvm_state(). Signed-off-by: Wei Yang --- migration/savevm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/migration/savevm.c b/migration/savevm.c index 2eea604624..6c61056cde 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -2406,7 +2406,7 @@ int qemu_loadvm_state(QEMUFile *f) unsigned int v; int ret; - if (qemu_savevm_state_blocked(&local_err)) { + if (migration_is_blocked(&local_err)) { error_report_err(local_err); return -EINVAL; } -- 2.19.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.9 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1C8E6C10F03 for ; Wed, 24 Apr 2019 00:57:29 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E1BDB2148D for ; Wed, 24 Apr 2019 00:57:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E1BDB2148D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([127.0.0.1]:33620 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJ6E4-0005y0-7H for qemu-devel@archiver.kernel.org; Tue, 23 Apr 2019 20:57:28 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57449) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJ6Ab-0003TN-MV for qemu-devel@nongnu.org; Tue, 23 Apr 2019 20:53:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hJ64V-0008VE-Pd for qemu-devel@nongnu.org; Tue, 23 Apr 2019 20:47:36 -0400 Received: from mga18.intel.com ([134.134.136.126]:13718) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hJ64V-0008TP-Hn for qemu-devel@nongnu.org; Tue, 23 Apr 2019 20:47:35 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 23 Apr 2019 17:47:35 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,387,1549958400"; d="scan'208";a="138265308" Received: from richard.sh.intel.com (HELO localhost) ([10.239.159.54]) by orsmga006.jf.intel.com with ESMTP; 23 Apr 2019 17:47:34 -0700 From: Wei Yang To: qemu-devel@nongnu.org Date: Wed, 24 Apr 2019 08:46:58 +0800 Message-Id: <20190424004700.12766-3-richardw.yang@linux.intel.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190424004700.12766-1-richardw.yang@linux.intel.com> References: <20190424004700.12766-1-richardw.yang@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.126 Subject: [Qemu-devel] [PATCH 2/4] migration/savevm: use migration_is_blocked to validate X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="UTF-8" Message-ID: <20190424004658.BOcgoMQmKmdbKFNa_bsf6A-_aGPpJqC58PAZddDf3Fw@z> migration_is_blocked() is used in migrate_prepare() and save_snapshot(), this is more proper to use this instead of qemu_savevm_state_blocked() in qemu_loadvm_state(). Signed-off-by: Wei Yang --- migration/savevm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/migration/savevm.c b/migration/savevm.c index 2eea604624..6c61056cde 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -2406,7 +2406,7 @@ int qemu_loadvm_state(QEMUFile *f) unsigned int v; int ret; - if (qemu_savevm_state_blocked(&local_err)) { + if (migration_is_blocked(&local_err)) { error_report_err(local_err); return -EINVAL; } -- 2.19.1