From nobody Tue Feb 10 14:49:15 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=1682343113; cv=none; d=zohomail.com; s=zohoarc; b=YaGTL27WR6M/rm6QUDIIwSi+qLrzeduVig3nzGo7b4kI9unx9Xm/ieYObIAZcQRdjW15PI1MeLWBrXUihhg6v1n9WkayCpBCCn29DuZFKJUswtl0KPF5nKnLk81Zr/vFvE5v6cTJaD97+Vny0WNhMzSI48wogE3JWEEHndDqMUg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682343113; 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=hgJGEFiRHVuS3WT7CRUSzkwrJRjVinYV1YnNK5RBqrc=; b=YuMHT765LJIU7Pe2hpRTfhdEPKxpWNsMYoC6W4ez0a/sKkpaMvBi045HDCDkTmcCoz/QYqv2u6L3UROUskqJHrb5vX8JHBw7FxKxnFv0s/LTiLeVIwbBv0mEd8jGQufHpVDZfcBkCOtQON9XKLKD2RyZctXlkGkpMHAUG/guFMo= 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 1682343113140763.8310476660446; Mon, 24 Apr 2023 06:31:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pqwFw-0008Jj-9f; Mon, 24 Apr 2023 09:29:24 -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 1pqwFY-0007PG-2K for qemu-devel@nongnu.org; Mon, 24 Apr 2023 09:29:02 -0400 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 1pqwFT-0001Y4-EJ for qemu-devel@nongnu.org; Mon, 24 Apr 2023 09:28:59 -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-33-nO-OBZV-Pp2-deWabiT0uA-1; Mon, 24 Apr 2023 09:28:49 -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 A040785A5A3; Mon, 24 Apr 2023 13:28:48 +0000 (UTC) Received: from secure.mitica (unknown [10.39.192.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id E177114171BA; Mon, 24 Apr 2023 13:28:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682342933; 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=hgJGEFiRHVuS3WT7CRUSzkwrJRjVinYV1YnNK5RBqrc=; b=cH0MOjfckc6V0IttIEeI3IR6iAzIz9i/I8gwc+QF8BJjt6hVCaPOQbjB27hVbY7OB3fpeL cKc2MPZFViAxkWhNHQMYN52Ujwq7RZgqNmz8EnUoRzevb7nWmsHDu70NxnZPHuCObpYKnn ts/fZ4VVIBaIElgeummdKtF4mHToEuc= X-MC-Unique: nO-OBZV-Pp2-deWabiT0uA-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 25/30] migration: Move migrate_announce_params() to option.c Date: Mon, 24 Apr 2023 15:27:25 +0200 Message-Id: <20230424132730.70752-26-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.129.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=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: 1682343113805100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Juan Quintela Reviewed-by: Fabiano Rosas --- Fix extra whitespace (fabiano) --- migration/migration.c | 14 -------------- migration/options.c | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index 5ab1e48f57..dccad95a55 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -954,20 +954,6 @@ MigrationParameters *qmp_query_migrate_parameters(Erro= r **errp) return params; } =20 -AnnounceParameters *migrate_announce_params(void) -{ - static AnnounceParameters ap; - - MigrationState *s =3D migrate_get_current(); - - ap.initial =3D s->parameters.announce_initial; - ap.max =3D s->parameters.announce_max; - ap.rounds =3D s->parameters.announce_rounds; - ap.step =3D s->parameters.announce_step; - - return ≈ -} - /* * Return true if we're already in the middle of a migration * (i.e. any of the active or setup states) diff --git a/migration/options.c b/migration/options.c index 2cb04fbbd1..418aafac64 100644 --- a/migration/options.c +++ b/migration/options.c @@ -16,6 +16,7 @@ #include "qapi/qapi-commands-migration.h" #include "qapi/qmp/qerror.h" #include "sysemu/runstate.h" +#include "migration/misc.h" #include "migration.h" #include "ram.h" #include "options.h" @@ -589,3 +590,19 @@ uint64_t migrate_xbzrle_cache_size(void) =20 return s->parameters.xbzrle_cache_size; } + +/* parameters helpers */ + +AnnounceParameters *migrate_announce_params(void) +{ + static AnnounceParameters ap; + + MigrationState *s =3D migrate_get_current(); + + ap.initial =3D s->parameters.announce_initial; + ap.max =3D s->parameters.announce_max; + ap.rounds =3D s->parameters.announce_rounds; + ap.step =3D s->parameters.announce_step; + + return ≈ +} --=20 2.39.2