From nobody Tue Nov 26 08:48:27 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1709097742; cv=none; d=zohomail.com; s=zohoarc; b=jXeiU49mn8njaKYacpysIMZSWaDOdHRkRj4rRuWVRQI6kzpdpUkli9qkNIbNSroK7Olrd8gyI3bCGvmcuB17KM5bpaJ7uYw/KNhT9+32qFFcv5Lnf5sMxm/L28X0AyLErVTypCBW+yfxgFWHVYqW5iEYJvucbosDWE3O1Twpt2M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1709097742; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=yruyBw49zJ5tVwVlBKVbE1Lx8R7iKPKHx4phAx9r0jE=; b=QmWkv1jUOQjqJWuair32cQn6wAIIFEjMUdX+4Is5/23PmwO3lC0Zt3ulxYCkSET7KIggFZWD+6eEicz86AXeHLV8/GXxwPkXwZW1/+XkheWaHu6FHWw5ujPlhUpQXMSZovqEG2Ropkm3Z25ihvJlIr4Rnv9TjjS9FY4BQS+HL60= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1709097742269742.4928735083013; Tue, 27 Feb 2024 21:22:22 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rfCK0-0002pW-69; Wed, 28 Feb 2024 00:17:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rfCJR-0001SS-7O for qemu-devel@nongnu.org; Wed, 28 Feb 2024 00:17:03 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rfCJP-0007c3-87 for qemu-devel@nongnu.org; Wed, 28 Feb 2024 00:17:00 -0500 Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-561-L20Dph42MiuM3VHlBC4gcw-1; Wed, 28 Feb 2024 00:16:55 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A606B38212D8; Wed, 28 Feb 2024 05:16:54 +0000 (UTC) Received: from x1n.redhat.com (unknown [10.72.116.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id E81C81C060B1; Wed, 28 Feb 2024 05:16:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709097418; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yruyBw49zJ5tVwVlBKVbE1Lx8R7iKPKHx4phAx9r0jE=; b=EQqEMIZWdxwogw8PWjjGwV/fYPxVxZKiF6Jjz8nNQqil6ohsWojDSKEg/rJRuyfH30YjHG 3emTo63m/LfqamJh0YTwHVW3ZhOUtvl5iaAwbQfUz5nCC9amxzEQR40H8OyWlCehtVjA+N k7EOjyxhF/JH5UaxRUqJzP1m0M0RrlI= X-MC-Unique: L20Dph42MiuM3VHlBC4gcw-1 From: peterx@redhat.com To: Peter Maydell , qemu-devel@nongnu.org Cc: David Hildenbrand , Eric Blake , Laurent Vivier , Paolo Bonzini , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Gerd Hoffmann , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Markus Armbruster , Fabiano Rosas , "Michael S. Tsirkin" , Thomas Huth , Jason Wang , Alex Williamson , Peter Xu , Steve Sistare Subject: [PULL 22/25] migration: options incompatible with cpr Date: Wed, 28 Feb 2024 13:13:12 +0800 Message-ID: <20240228051315.400759-23-peterx@redhat.com> In-Reply-To: <20240228051315.400759-1-peterx@redhat.com> References: <20240228051315.400759-1-peterx@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.7 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=170.10.129.124; envelope-from=peterx@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.088, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1709097742562100001 Content-Type: text/plain; charset="utf-8" From: Steve Sistare Fail the migration request if options are set that are incompatible with cpr. Signed-off-by: Steve Sistare Reviewed-by: Peter Xu Link: https://lore.kernel.org/r/1708622920-68779-15-git-send-email-steven.s= istare@oracle.com Signed-off-by: Peter Xu --- qapi/migration.json | 2 ++ migration/migration.c | 17 +++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/qapi/migration.json b/qapi/migration.json index bee5e71fe3..0b33a71ab4 100644 --- a/qapi/migration.json +++ b/qapi/migration.json @@ -657,6 +657,8 @@ # shared backend must be be non-volatile across reboot, such as by bac= king # it with a dax device. # +# cpr-reboot may not be used with postcopy, colo, or background-snapsh= ot. +# # (since 8.2) ## { 'enum': 'MigMode', diff --git a/migration/migration.c b/migration/migration.c index 90a90947fb..7652fd4d14 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1953,6 +1953,23 @@ static bool migrate_prepare(MigrationState *s, bool = blk, bool blk_inc, return false; } =20 + if (migrate_mode_is_cpr(s)) { + const char *conflict =3D NULL; + + if (migrate_postcopy()) { + conflict =3D "postcopy"; + } else if (migrate_background_snapshot()) { + conflict =3D "background snapshot"; + } else if (migrate_colo()) { + conflict =3D "COLO"; + } + + if (conflict) { + error_setg(errp, "Cannot use %s with CPR", conflict); + return false; + } + } + if (blk || blk_inc) { if (migrate_colo()) { error_setg(errp, "No disk migration is required in COLO mode"); --=20 2.43.0