From nobody Tue Feb 10 14:49:24 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=1682343383; cv=none; d=zohomail.com; s=zohoarc; b=lfUEtsYrDmlwdv6npJUwg3rfKowZAI8LwmWJwdRbDNKdsEtHRiIv2CGaqcjbTZvt5YDArSLw1Xw8QHuIyNFbOpPsV73XoYfbce8fP0v2O23GK5EEHfFEzBR4FmzPcmuzG1TBLqwBbAH9LFTw9IknHuxJ5mFkulYBqBvOAFeynGE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682343383; 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=5Y7RGTDKI8ZvEqaVqwbEM/HOCZU6iz3m3HWBM8BTaYU=; b=kJMlHXyWgq91m9SsRb1aJEYBnl0QD36n3FmhA8eprmtfoltuWaO2pN9oUeDANhbywH6XW2nxsaUl/ryY0I+VOYge1qYF2KvIfTo5YmdfdMBUYTkR2twup7akeN571kUVSnLyHuU8Hc8gTpxQTqU0OkpZrL3m9Qbc85Iorh/DgdU= 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 1682343383835153.49203093713584; Mon, 24 Apr 2023 06:36:23 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pqwFs-00089L-Bi; Mon, 24 Apr 2023 09:29:20 -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-0007PI-3W 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-0001V7-FP for qemu-devel@nongnu.org; Mon, 24 Apr 2023 09:28:59 -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-505-2BEW58Z7NGG9VVcssCEsrg-1; Mon, 24 Apr 2023 09:28:32 -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 8714D3815F64; Mon, 24 Apr 2023 13:28:31 +0000 (UTC) Received: from secure.mitica (unknown [10.39.192.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id DF41B14171B8; Mon, 24 Apr 2023 13:28:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682342915; 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=5Y7RGTDKI8ZvEqaVqwbEM/HOCZU6iz3m3HWBM8BTaYU=; b=R+HeK+3K0xzxdW28QSATZ+zej0gBZKsdhtT9i30l2HA53YSMXqjgAejrJeQrA1K5dmYTNC BRuuz7VNJGAIs36kOezWRrXbj1no+JIJmfgW0gE/YxCESTQPE53x3RDveq8TEzUCS8qSvV 0Lx2Er+4B20cBDYCEF0QYx3Bq7l8GrI= X-MC-Unique: 2BEW58Z7NGG9VVcssCEsrg-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 Subject: [PULL 19/30] migration: Move parameters functions to option.c Date: Mon, 24 Apr 2023 15:27:19 +0200 Message-Id: <20230424132730.70752-20-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=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: 1682343385461100005 Content-Type: text/plain; charset="utf-8" Signed-off-by: Juan Quintela Reviewed-by: Vladimir Sementsov-Ogievskiy --- migration/migration.c | 91 --------------------------------------- migration/migration.h | 11 ----- migration/multifd-zlib.c | 1 + migration/multifd-zstd.c | 1 + migration/options.c | 93 ++++++++++++++++++++++++++++++++++++++++ migration/options.h | 13 ++++++ 6 files changed, 108 insertions(+), 102 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index ddd3fc361f..f19ab592ae 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -2264,79 +2264,6 @@ bool migrate_postcopy(void) return migrate_postcopy_ram() || migrate_dirty_bitmaps(); } =20 -int migrate_compress_level(void) -{ - MigrationState *s; - - s =3D migrate_get_current(); - - return s->parameters.compress_level; -} - -int migrate_compress_threads(void) -{ - MigrationState *s; - - s =3D migrate_get_current(); - - return s->parameters.compress_threads; -} - -int migrate_compress_wait_thread(void) -{ - MigrationState *s; - - s =3D migrate_get_current(); - - return s->parameters.compress_wait_thread; -} - -int migrate_decompress_threads(void) -{ - MigrationState *s; - - s =3D migrate_get_current(); - - return s->parameters.decompress_threads; -} - -int migrate_multifd_channels(void) -{ - MigrationState *s; - - s =3D migrate_get_current(); - - return s->parameters.multifd_channels; -} - -MultiFDCompression migrate_multifd_compression(void) -{ - MigrationState *s; - - s =3D migrate_get_current(); - - assert(s->parameters.multifd_compression < MULTIFD_COMPRESSION__MAX); - return s->parameters.multifd_compression; -} - -int migrate_multifd_zlib_level(void) -{ - MigrationState *s; - - s =3D migrate_get_current(); - - return s->parameters.multifd_zlib_level; -} - -int migrate_multifd_zstd_level(void) -{ - MigrationState *s; - - s =3D migrate_get_current(); - - return s->parameters.multifd_zstd_level; -} - int migrate_use_tls(void) { MigrationState *s; @@ -2346,24 +2273,6 @@ int migrate_use_tls(void) return s->parameters.tls_creds && *s->parameters.tls_creds; } =20 -uint64_t migrate_xbzrle_cache_size(void) -{ - MigrationState *s; - - s =3D migrate_get_current(); - - return s->parameters.xbzrle_cache_size; -} - -static int64_t migrate_max_postcopy_bandwidth(void) -{ - MigrationState *s; - - s =3D migrate_get_current(); - - return s->parameters.max_postcopy_bandwidth; -} - bool migrate_use_block_incremental(void) { MigrationState *s; diff --git a/migration/migration.h b/migration/migration.h index 24184622a8..8451e5f2fe 100644 --- a/migration/migration.h +++ b/migration/migration.h @@ -449,24 +449,13 @@ MigrationState *migrate_get_current(void); =20 bool migrate_postcopy(void); =20 -int migrate_multifd_channels(void); -MultiFDCompression migrate_multifd_compression(void); -int migrate_multifd_zlib_level(void); -int migrate_multifd_zstd_level(void); - int migrate_use_tls(void); -uint64_t migrate_xbzrle_cache_size(void); =20 bool migrate_use_block_incremental(void); int migrate_max_cpu_throttle(void); =20 uint64_t ram_get_total_transferred_pages(void); =20 -int migrate_compress_level(void); -int migrate_compress_threads(void); -int migrate_compress_wait_thread(void); -int migrate_decompress_threads(void); - /* Sending on the return path - generic and then for each message type */ void migrate_send_rp_shut(MigrationIncomingState *mis, uint32_t value); diff --git a/migration/multifd-zlib.c b/migration/multifd-zlib.c index 37770248e1..81701250ad 100644 --- a/migration/multifd-zlib.c +++ b/migration/multifd-zlib.c @@ -18,6 +18,7 @@ #include "qapi/error.h" #include "migration.h" #include "trace.h" +#include "options.h" #include "multifd.h" =20 struct zlib_data { diff --git a/migration/multifd-zstd.c b/migration/multifd-zstd.c index f4a8e1ed1f..d1d29e76cc 100644 --- a/migration/multifd-zstd.c +++ b/migration/multifd-zstd.c @@ -18,6 +18,7 @@ #include "qapi/error.h" #include "migration.h" #include "trace.h" +#include "options.h" #include "multifd.h" =20 struct zstd_data { diff --git a/migration/options.c b/migration/options.c index f3b2d6e482..8d15be858c 100644 --- a/migration/options.c +++ b/migration/options.c @@ -460,3 +460,96 @@ void qmp_migrate_set_capabilities(MigrationCapabilityS= tatusList *params, s->capabilities[cap->value->capability] =3D cap->value->state; } } + +/* parameters */ + +int migrate_compress_level(void) +{ + MigrationState *s; + + s =3D migrate_get_current(); + + return s->parameters.compress_level; +} + +int migrate_compress_threads(void) +{ + MigrationState *s; + + s =3D migrate_get_current(); + + return s->parameters.compress_threads; +} + +int migrate_compress_wait_thread(void) +{ + MigrationState *s; + + s =3D migrate_get_current(); + + return s->parameters.compress_wait_thread; +} + +int migrate_decompress_threads(void) +{ + MigrationState *s; + + s =3D migrate_get_current(); + + return s->parameters.decompress_threads; +} + +int64_t migrate_max_postcopy_bandwidth(void) +{ + MigrationState *s; + + s =3D migrate_get_current(); + + return s->parameters.max_postcopy_bandwidth; +} + +int migrate_multifd_channels(void) +{ + MigrationState *s; + + s =3D migrate_get_current(); + + return s->parameters.multifd_channels; +} + +MultiFDCompression migrate_multifd_compression(void) +{ + MigrationState *s; + + s =3D migrate_get_current(); + + assert(s->parameters.multifd_compression < MULTIFD_COMPRESSION__MAX); + return s->parameters.multifd_compression; +} + +int migrate_multifd_zlib_level(void) +{ + MigrationState *s; + + s =3D migrate_get_current(); + + return s->parameters.multifd_zlib_level; +} + +int migrate_multifd_zstd_level(void) +{ + MigrationState *s; + + s =3D migrate_get_current(); + + return s->parameters.multifd_zstd_level; +} + +uint64_t migrate_xbzrle_cache_size(void) +{ + MigrationState *s; + + s =3D migrate_get_current(); + + return s->parameters.xbzrle_cache_size; +} diff --git a/migration/options.h b/migration/options.h index 5979e4ff90..b24ee92283 100644 --- a/migration/options.h +++ b/migration/options.h @@ -43,4 +43,17 @@ bool migrate_zero_copy_send(void); bool migrate_caps_check(bool *old_caps, bool *new_caps, Error **errp); bool migrate_cap_set(int cap, bool value, Error **errp); =20 +/* parameters */ + +int migrate_compress_level(void); +int migrate_compress_threads(void); +int migrate_compress_wait_thread(void); +int migrate_decompress_threads(void); +int64_t migrate_max_postcopy_bandwidth(void); +int migrate_multifd_channels(void); +MultiFDCompression migrate_multifd_compression(void); +int migrate_multifd_zlib_level(void); +int migrate_multifd_zstd_level(void); +uint64_t migrate_xbzrle_cache_size(void); + #endif --=20 2.39.2