From nobody Tue Feb 10 13:16:20 2026 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=1682343551; cv=none; d=zohomail.com; s=zohoarc; b=j/is+RULAKLgAqlcpsNJEU2POTNuf2SJhYfxVB73WW97kwEp7iJw575VNH/RtBleG7gM34xBWicoOI8+MNnj0RfSmAlWmk9efkzyOE00D53kQwlGrVh+2IkekNYWKaKsGWoyLNMZa/1ZagfIijJRKnpjHRN3QUxseEqf8ODw8ds= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682343551; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=+6n+gAfOkuODCtOAVM6y39i4P0a+dylqFR14uo3fg14=; b=eB0+WM6Av57s6YCxENwSYzhQUKaW9nemCir3I8dvIiXJm3QZRoBn/jYQm9+h7fkT/hCQJZ3hJ+iy8OsUEzLgPa7OBNJfblDZGI5ssHWn2O5YcP24nC0k6LhP4Qiysj+ytn7l6D3WzQ3YVuiwOnY5vLFAimSeBrRV83Uc8glpHGw= 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 1682343551684746.2463044017801; Mon, 24 Apr 2023 06:39:11 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pqwGA-0000RM-IB; Mon, 24 Apr 2023 09:29:38 -0400 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 1pqwFh-0007Zo-T2 for qemu-devel@nongnu.org; Mon, 24 Apr 2023 09:29:10 -0400 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 1pqwFg-0001de-DY for qemu-devel@nongnu.org; Mon, 24 Apr 2023 09:29:09 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-488-zyEeBVmjPOyTomDF_u9EjA-1; Mon, 24 Apr 2023 09:29:03 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 784DDA0F383; Mon, 24 Apr 2023 13:29:02 +0000 (UTC) Received: from secure.mitica (unknown [10.39.192.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id C053814171B8; Mon, 24 Apr 2023 13:28:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682342947; 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=+6n+gAfOkuODCtOAVM6y39i4P0a+dylqFR14uo3fg14=; b=EDbvaBPcOo7t/Hx/mgOuYREH9k93WWlLQz9SPqx/4FBSdYBBa1XQztodSRgYpbi6MwhdCW bki5OeUxN6x6WnWjJsvlsT/UylpsrKV0DYmWutiHUsG9z6hP9tLEuY+AuYmV+eeAlCjdvh EcY1IHDN7Hzoc3S1GHm9vWVj7pEnl5w= X-MC-Unique: zyEeBVmjPOyTomDF_u9EjA-1 From: Juan Quintela To: qemu-devel@nongnu.org Cc: Hailiang Zhang , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Fam Zheng , Eric Blake , John Snow , Vladimir Sementsov-Ogievskiy , Gerd Hoffmann , Peter Xu , Markus Armbruster , Leonardo Bras , David Hildenbrand , Stefan Hajnoczi , "Michael S. Tsirkin" , qemu-block@nongnu.org, Juan Quintela , Fabiano Rosas Subject: [PULL 29/30] migration: Move migrate_postcopy() to options.c Date: Mon, 24 Apr 2023 15:27:29 +0200 Message-Id: <20230424132730.70752-30-quintela@redhat.com> In-Reply-To: <20230424132730.70752-1-quintela@redhat.com> References: <20230424132730.70752-1-quintela@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.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.133.124; envelope-from=quintela@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.171, 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=unavailable 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: 1682343553607100010 Content-Type: text/plain; charset="utf-8" Signed-off-by: Juan Quintela Reviewed-by: Fabiano Rosas --- migration/migration.c | 5 ----- migration/migration.h | 2 -- migration/options.c | 8 ++++++++ migration/options.h | 9 +++++++++ 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index dccad95a55..f20d7bcc06 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -2245,11 +2245,6 @@ void qmp_migrate_continue(MigrationStatus state, Err= or **errp) qemu_sem_post(&s->pause_sem); } =20 -bool migrate_postcopy(void) -{ - return migrate_postcopy_ram() || migrate_dirty_bitmaps(); -} - int migrate_use_tls(void) { MigrationState *s; diff --git a/migration/migration.h b/migration/migration.h index 3ae938b19c..dcf906868d 100644 --- a/migration/migration.h +++ b/migration/migration.h @@ -447,8 +447,6 @@ bool migration_is_blocked(Error **errp); bool migration_in_postcopy(void); MigrationState *migrate_get_current(void); =20 -bool migrate_postcopy(void); - int migrate_use_tls(void); =20 uint64_t ram_get_total_transferred_pages(void); diff --git a/migration/options.c b/migration/options.c index 615534c151..8bd2d949ae 100644 --- a/migration/options.c +++ b/migration/options.c @@ -204,6 +204,14 @@ bool migrate_zero_copy_send(void) =20 return s->capabilities[MIGRATION_CAPABILITY_ZERO_COPY_SEND]; } + +/* pseudo capabilities */ + +bool migrate_postcopy(void) +{ + return migrate_postcopy_ram() || migrate_dirty_bitmaps(); +} + typedef enum WriteTrackingSupport { WT_SUPPORT_UNKNOWN =3D 0, WT_SUPPORT_ABSENT, diff --git a/migration/options.h b/migration/options.h index 99f6bbd7a1..093bc907a1 100644 --- a/migration/options.h +++ b/migration/options.h @@ -38,6 +38,15 @@ bool migrate_xbzrle(void); bool migrate_zero_blocks(void); bool migrate_zero_copy_send(void); =20 +/* + * pseudo capabilities + * + * These are functions that are used in a similar way to capabilities + * check, but they are not a capability. + */ + +bool migrate_postcopy(void); + /* capabilities helpers */ =20 bool migrate_caps_check(bool *old_caps, bool *new_caps, Error **errp); --=20 2.39.2