From nobody Wed Nov 19 16:44:51 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.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=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1616640891; cv=none; d=zohomail.com; s=zohoarc; b=ZH+e2rHH0QiPOXL7QKD/XM6GogAA1hr6VghlTy7uOhbQJM/UC5jQIAsrTnHaWlhzVUM0CH0JFpbL62MEmu34a/sOpatV8h0LLk2B7Tya1ZHA+zcMuXwqDtx5l5rq5jpKkSimztRsgbiUfZxioqKJdugajWZ40tB3Z+lk7OO034g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616640891; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=Bo/XCCiVO+2aZaM4IboRhaWvNMYivMqQIA37cX2NhOM=; b=IMJDSIVB5YLXdC/pw3YcRhp7Ju9HkhdCrXMHrvUukwmFg4smlXq349yrY958FIYOC2MZ6KUbVV3Kjsrdhsw/8Eaz/2HB8QIQoUiDjuBMlLr+o7rYrTf1qClLlaTS9i3J4YYBXGmp8gfSnm0nXdkXHXkJnvh4eAxffa2irccWlMw= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.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 (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1616640891726358.09270056203934; Wed, 24 Mar 2021 19:54:51 -0700 (PDT) Received: from localhost ([::1]:38442 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lPG94-0000Tu-NB for importer@patchew.org; Wed, 24 Mar 2021 22:54:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37628) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lPG2k-00010z-Lw for qemu-devel@nongnu.org; Wed, 24 Mar 2021 22:48:18 -0400 Received: from mga07.intel.com ([134.134.136.100]:40251) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lPG2e-0001ZZ-Fu for qemu-devel@nongnu.org; Wed, 24 Mar 2021 22:48:18 -0400 Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Mar 2021 19:48:11 -0700 Received: from unknown (HELO localhost.localdomain.bj.intel.com) ([10.240.192.103]) by orsmga003.jf.intel.com with ESMTP; 24 Mar 2021 19:48:09 -0700 IronPort-SDR: Gs2YxKAfmM5f5S41skjiRrG2hvLxSXJiCvql890Qy8UDBFRfhqbKCyxlGrjbpDxPOFlw0O/hps 2uZXC6BCTATA== X-IronPort-AV: E=McAfee;i="6000,8403,9933"; a="254823119" X-IronPort-AV: E=Sophos;i="5.81,276,1610438400"; d="scan'208";a="254823119" IronPort-SDR: T+ZZUJ6bXG8PEOVDdVM2k8w2rA2gnVlawzgJ6KufPcCvUGTiroeftagCbThPclCjY6XLQKltkS NNeMcwZD9WoA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,276,1610438400"; d="scan'208";a="374881402" From: leirao To: chen.zhang@intel.com, lizhijian@cn.fujitsu.com, jasowang@redhat.com, quintela@redhat.com, dgilbert@redhat.com, pbonzini@redhat.com, lukasstraub2@web.de Subject: [PATCH v4 04/10] Remove migrate_set_block_enabled in checkpoint Date: Thu, 25 Mar 2021 10:24:45 +0800 Message-Id: <1616639091-28279-5-git-send-email-lei.rao@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1616639091-28279-1-git-send-email-lei.rao@intel.com> References: <1616639091-28279-1-git-send-email-lei.rao@intel.com> Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=134.134.136.100; envelope-from=lei.rao@intel.com; helo=mga07.intel.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: "Rao, Lei" , qemu-devel@nongnu.org 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" From: "Rao, Lei" We can detect disk migration in migrate_prepare, if disk migration is enabled in COLO mode, we can directly report an error.and there is no need to disable block migration at every checkpoint. Signed-off-by: Lei Rao Signed-off-by: Zhang Chen Reviewed-by: Li Zhijian --- migration/colo.c | 6 ------ migration/migration.c | 4 ++++ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/migration/colo.c b/migration/colo.c index de27662..1aaf316 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -435,12 +435,6 @@ static int colo_do_checkpoint_transaction(MigrationSta= te *s, if (failover_get_state() !=3D FAILOVER_STATUS_NONE) { goto out; } - - /* Disable block migration */ - migrate_set_block_enabled(false, &local_err); - if (local_err) { - goto out; - } qemu_mutex_lock_iothread(); =20 #ifdef CONFIG_REPLICATION diff --git a/migration/migration.c b/migration/migration.c index ca8b97b..4578f22 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -2219,6 +2219,10 @@ static bool migrate_prepare(MigrationState *s, bool = blk, bool blk_inc, } =20 if (blk || blk_inc) { + if (migrate_colo_enabled()) { + error_setg(errp, "No disk migration is required in COLO mode"); + return false; + } if (migrate_use_block() || migrate_use_block_incremental()) { error_setg(errp, "Command options are incompatible with " "current migration capabilities"); --=20 1.8.3.1