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 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0C82EC47DD9 for ; Wed, 28 Feb 2024 07:22:59 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rfEGY-0001eJ-Mo; Wed, 28 Feb 2024 02:22:10 -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 1rfEGQ-0001dI-AI for qemu-devel@nongnu.org; Wed, 28 Feb 2024 02:22:02 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rfEGO-0004jM-Md for qemu-devel@nongnu.org; Wed, 28 Feb 2024 02:22:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709104918; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=14VnERezMic/xnb1TEpxptVi4c59vpd5H34P0nUNjaA=; b=OMI0SuHQjgyr1FaRU0JVKkbLBTSxn3Kkxv3HjmQWIlcnTI6czP6TPHF7nIhRSaWSKJO1Pd S04u7k+arWOtW+tve9LF9qZFTVFrqvknU9Rj8wymOjN0JtwaCOlRG7r6j2WgvZAvAHib9R hd/Tf4er5B3eVHIIMJYmvgWzxQKDyOE= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-2-wXXtY1lnMXaRT7DGobPb8w-1; Wed, 28 Feb 2024 02:21:55 -0500 X-MC-Unique: wXXtY1lnMXaRT7DGobPb8w-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (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 4AD36185A782; Wed, 28 Feb 2024 07:21:55 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.193.4]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 09752492BC6; Wed, 28 Feb 2024 07:21:53 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id B2BF321E66F9; Wed, 28 Feb 2024 08:21:51 +0100 (CET) From: Markus Armbruster To: Steve Sistare Cc: qemu-devel@nongnu.org, Peter Xu , Fabiano Rosas , "Michael S. Tsirkin" , Jason Wang , Alex Williamson , Cedric Le Goater , Gerd Hoffmann , Marc-Andre Lureau , David Hildenbrand Subject: Re: [PATCH V4 14/14] migration: options incompatible with cpr In-Reply-To: <1708622920-68779-15-git-send-email-steven.sistare@oracle.com> (Steve Sistare's message of "Thu, 22 Feb 2024 09:28:40 -0800") References: <1708622920-68779-1-git-send-email-steven.sistare@oracle.com> <1708622920-68779-15-git-send-email-steven.sistare@oracle.com> Date: Wed, 28 Feb 2024 08:21:51 +0100 Message-ID: <87cysh3vg0.fsf@pond.sub.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.9 Received-SPF: pass client-ip=170.10.133.124; envelope-from=armbru@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_H4=0.001, RCVD_IN_MSPIKE_WL=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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Steve Sistare writes: > Fail the migration request if options are set that are incompatible > with cpr. > > Signed-off-by: Steve Sistare > --- > migration/migration.c | 17 +++++++++++++++++ > qapi/migration.json | 2 ++ > 2 files changed, 19 insertions(+) > > diff --git a/migration/migration.c b/migration/migration.c > index 90a9094..7652fd4 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; > } > > + if (migrate_mode_is_cpr(s)) { > + const char *conflict = NULL; > + > + if (migrate_postcopy()) { > + conflict = "postcopy"; > + } else if (migrate_background_snapshot()) { > + conflict = "background snapshot"; > + } else if (migrate_colo()) { > + conflict = "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"); > diff --git a/qapi/migration.json b/qapi/migration.json > index 0990297..c6bfe2e 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 backing > # it with a dax device. > # > +# cpr-reboot may not be used with postcopy, colo, or background-snapshot. > +# @cpr-reboot COLO Wrap the line: # @cpr-reboot may not be used with postcopy, COLO, or # background-snapshot. This doesn't tell the reader what settings exactly do not work with @cpr-reboot. For instance "background-snapshot" is about enabling migration capability @background-snapshot. We could write something like "is incompatible with enabling migration capability @background-snapshot". Same for the other two. Worthwhile? > # (since 8.2) > ## > { 'enum': 'MigMode',