From nobody Mon Feb 9 20:46:01 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=1682361276; cv=none; d=zohomail.com; s=zohoarc; b=S/xcj5ayiRRWisLmhqY5HTZTZypBQjPsd0s99GBE1t3q1Av4MwlMsxhtncwqq33GVsPPnQnsPj/aBsKXb7Wi45AgqETy4I71XSe1GErCpX4x4um0AomBwIE9agko61xoYJtj66Q/K5CUzu1exBNpL82ULmKYquf4ic2XgeZlexE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682361276; 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=tPBJogRHOixp3KZKB1TK9lokwpKUyot/J9v/7Ob/qWk=; b=GG9DNWz+1GxsU1QPzv1m1fJcDljVIddtnnFLy0mCHcZ2WYk/Kz4acENwIBr7fyOQG5dCxCAoQoG9q4/tyKaW2/710pFKBvBo9qjzCmiTqfERKL9U57jLBIzjj3holtKC9Wkr7KJXI48n8KsMBlHga0f4XNKpUmO2XVa6+t7XGa4= 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 1682361276546215.30460564729515; Mon, 24 Apr 2023 11:34:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pr100-0000QI-Qm; Mon, 24 Apr 2023 14:33:16 -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 1pr0zw-0000JK-AS for qemu-devel@nongnu.org; Mon, 24 Apr 2023 14:33:12 -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 1pr0zj-0005ez-QV for qemu-devel@nongnu.org; Mon, 24 Apr 2023 14:33:09 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-191-b__nUaQoNAyFHSO5M7tqIg-1; Mon, 24 Apr 2023 14:32:51 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E908C299E74A; Mon, 24 Apr 2023 18:32:50 +0000 (UTC) Received: from secure.mitica (unknown [10.39.192.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id 578B2C15BA0; Mon, 24 Apr 2023 18:32:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682361175; 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=tPBJogRHOixp3KZKB1TK9lokwpKUyot/J9v/7Ob/qWk=; b=cFTzc9Qkc0ST3+FTj7/q6Q6tw+4LwzHFw2s8IdBi2yy6GK5gZHUqr1Mqg4qm833to8AgHd /PVenABkcXNBltRc8YJOkcY7XOAuwmYcfohQLnsI8ymx+G2hIieEZ062Pk7Bn9qFN+NQut /TxM14OieTmbO6XXe7fb4Ybb4dgXtyY= X-MC-Unique: b__nUaQoNAyFHSO5M7tqIg-1 From: Juan Quintela To: qemu-devel@nongnu.org Cc: Vladimir Sementsov-Ogievskiy , Leonardo Bras , Stefan Hajnoczi , Fam Zheng , Juan Quintela , qemu-block@nongnu.org, Peter Xu , Eric Blake , John Snow Subject: [PATCH v3 06/13] migration: Move migrate_set_block_incremental() to options.c Date: Mon, 24 Apr 2023 20:32:29 +0200 Message-Id: <20230424183236.74561-7-quintela@redhat.com> In-Reply-To: <20230424183236.74561-1-quintela@redhat.com> References: <20230424183236.74561-1-quintela@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 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=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: 1682361279022100003 Content-Type: text/plain; charset="utf-8" Once there, make it more regular and remove th eneed for MigrationState parameter. Signed-off-by: Juan Quintela Reviewed-by: Vladimir Sementsov-Ogievskiy --- migration/migration.c | 9 ++------- migration/options.c | 9 +++++++++ migration/options.h | 4 ++++ 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index ee8e9416ce..9a42f73aeb 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1164,17 +1164,12 @@ void migrate_set_state(int *state, int old_state, i= nt new_state) } } =20 -static void migrate_set_block_incremental(MigrationState *s, bool value) -{ - s->parameters.block_incremental =3D value; -} - static void block_cleanup_parameters(MigrationState *s) { if (s->must_remove_block_options) { /* setting to false can never fail */ migrate_cap_set(MIGRATION_CAPABILITY_BLOCK, false, &error_abort); - migrate_set_block_incremental(s, false); + migrate_set_block_incremental(false); s->must_remove_block_options =3D false; } } @@ -1668,7 +1663,7 @@ static bool migrate_prepare(MigrationState *s, bool b= lk, bool blk_inc, } =20 if (blk_inc) { - migrate_set_block_incremental(s, true); + migrate_set_block_incremental(true); } =20 migrate_init(s); diff --git a/migration/options.c b/migration/options.c index ba854f613f..37f7051d9d 100644 --- a/migration/options.c +++ b/migration/options.c @@ -586,6 +586,15 @@ uint64_t migrate_xbzrle_cache_size(void) return s->parameters.xbzrle_cache_size; } =20 +/* parameter setters */ + +void migrate_set_block_incremental(bool value) +{ + MigrationState *s =3D migrate_get_current(); + + s->parameters.block_incremental =3D value; +} + /* parameters helpers */ =20 AnnounceParameters *migrate_announce_params(void) diff --git a/migration/options.h b/migration/options.h index e982103c0d..d261a25441 100644 --- a/migration/options.h +++ b/migration/options.h @@ -82,6 +82,10 @@ int migrate_multifd_zstd_level(void); uint8_t migrate_throttle_trigger_threshold(void); uint64_t migrate_xbzrle_cache_size(void); =20 +/* parameters setters */ + +void migrate_set_block_incremental(bool value); + /* parameters helpers */ =20 bool migrate_params_check(MigrationParameters *params, Error **errp); --=20 2.39.2