From nobody Tue Feb 10 14:49:16 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=1682343564; cv=none; d=zohomail.com; s=zohoarc; b=b1udGEbW0Bpi1SBRHzwSSMmC+KN1CPm34tBARip8Zs2YkSx9AwCXHb3R6ibu8w0WlcZY3ISpoXHd9t1SnFjDvmQ9oDmXYpT6v5mYX7IQzEEh7skgtRHB8POxxNsQ4H32xjzeBEuUJ8jXROK3S2ZClDirT2Ywqtf1jCG1De2PCRk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682343564; 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=q9ahs+q7FcUaSl0xPsWuyFe/zAiH38ZcWWKpoDRd9rA=; b=Yh05JjT+Mt6CmslIqDtmN9Wxl2nGQD1Fl8gccmPhbwAt1Le32IUPRp4vIQqAG21+WPNpdg0xsS88avAu59z+8NvfL+8PgGrPKo8JpW2sdgWFmQTfUNNmDoN958ipWoapKxzHAC1mjU3AxLIDFRIgIG/t7KrwHiqiVpD7Dq6XHvk= 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 1682343564494492.26501858806535; Mon, 24 Apr 2023 06:39:24 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pqwFn-0007nq-3N; Mon, 24 Apr 2023 09:29:15 -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 1pqwEq-0006bK-L9 for qemu-devel@nongnu.org; Mon, 24 Apr 2023 09:28:17 -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 1pqwEn-0001Qa-A5 for qemu-devel@nongnu.org; Mon, 24 Apr 2023 09:28:16 -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-656-h4aK7-PsMxynvlsNYRLDAg-1; Mon, 24 Apr 2023 09:28:09 -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 D971C3815F69; Mon, 24 Apr 2023 13:28:08 +0000 (UTC) Received: from secure.mitica (unknown [10.39.192.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4291414171B8; Mon, 24 Apr 2023 13:28:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682342892; 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=q9ahs+q7FcUaSl0xPsWuyFe/zAiH38ZcWWKpoDRd9rA=; b=AQiFGaOStTje9Tk2raM4kZDXDy43z4yapc86EN7qdYhRjWTyCrpMrCQcbUMIoXmF080GZ2 Xsr/Qte6YDpMPFR4Y4sPiGeMLlF9TqEJkX3O6LsFOlMqxW5RskQ7kNEoswPYgyEx5vOP27 phXdySmMGbEpaNp8t9/8HNBfw6S7weA= X-MC-Unique: h4aK7-PsMxynvlsNYRLDAg-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 11/30] migration: Move migrate_use_xbzrle() to options.c Date: Mon, 24 Apr 2023 15:27:11 +0200 Message-Id: <20230424132730.70752-12-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: 1682343565679100008 Content-Type: text/plain; charset="utf-8" Once that we are there, we rename the function to migrate_xbzrle() to be consistent with all other capabilities. We change the type to return bool also for consistency. Signed-off-by: Juan Quintela Reviewed-by: Vladimir Sementsov-Ogievskiy --- migration/migration.c | 11 +---------- migration/migration.h | 1 - migration/options.c | 9 +++++++++ migration/options.h | 1 + migration/ram.c | 10 +++++----- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index fbb61819ca..abb820cdb9 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1122,7 +1122,7 @@ static void populate_ram_info(MigrationInfo *info, Mi= grationState *s) info->ram->downtime_bytes =3D stat64_get(&ram_counters.downtime_bytes); info->ram->postcopy_bytes =3D stat64_get(&ram_counters.postcopy_bytes); =20 - if (migrate_use_xbzrle()) { + if (migrate_xbzrle()) { info->xbzrle_cache =3D g_malloc0(sizeof(*info->xbzrle_cache)); info->xbzrle_cache->cache_size =3D migrate_xbzrle_cache_size(); info->xbzrle_cache->bytes =3D xbzrle_counters.bytes; @@ -2604,15 +2604,6 @@ int migrate_use_tls(void) return s->parameters.tls_creds && *s->parameters.tls_creds; } =20 -int migrate_use_xbzrle(void) -{ - MigrationState *s; - - s =3D migrate_get_current(); - - return s->capabilities[MIGRATION_CAPABILITY_XBZRLE]; -} - uint64_t migrate_xbzrle_cache_size(void) { MigrationState *s; diff --git a/migration/migration.h b/migration/migration.h index c939f82d53..e2bb5b1e2f 100644 --- a/migration/migration.h +++ b/migration/migration.h @@ -455,7 +455,6 @@ int migrate_multifd_zlib_level(void); int migrate_multifd_zstd_level(void); =20 int migrate_use_tls(void); -int migrate_use_xbzrle(void); uint64_t migrate_xbzrle_cache_size(void); =20 bool migrate_use_block(void); diff --git a/migration/options.c b/migration/options.c index f357c99996..25264c500e 100644 --- a/migration/options.c +++ b/migration/options.c @@ -147,6 +147,15 @@ bool migrate_validate_uuid(void) return s->capabilities[MIGRATION_CAPABILITY_VALIDATE_UUID]; } =20 +bool migrate_xbzrle(void) +{ + MigrationState *s; + + s =3D migrate_get_current(); + + return s->capabilities[MIGRATION_CAPABILITY_XBZRLE]; +} + bool migrate_zero_blocks(void) { MigrationState *s; diff --git a/migration/options.h b/migration/options.h index ad22f4d24a..8f76a88329 100644 --- a/migration/options.h +++ b/migration/options.h @@ -31,6 +31,7 @@ bool migrate_postcopy_preempt(void); bool migrate_postcopy_ram(void); bool migrate_release_ram(void); bool migrate_validate_uuid(void); +bool migrate_xbzrle(void); bool migrate_zero_blocks(void); bool migrate_zero_copy_send(void); =20 diff --git a/migration/ram.c b/migration/ram.c index 859dd7b63f..4576d0d849 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -156,14 +156,14 @@ static struct { =20 static void XBZRLE_cache_lock(void) { - if (migrate_use_xbzrle()) { + if (migrate_xbzrle()) { qemu_mutex_lock(&XBZRLE.lock); } } =20 static void XBZRLE_cache_unlock(void) { - if (migrate_use_xbzrle()) { + if (migrate_xbzrle()) { qemu_mutex_unlock(&XBZRLE.lock); } } @@ -1137,7 +1137,7 @@ static void migration_update_rates(RAMState *rs, int6= 4_t end_time) return; } =20 - if (migrate_use_xbzrle()) { + if (migrate_xbzrle()) { double encoded_size, unencoded_size; =20 xbzrle_counters.cache_miss_rate =3D (double)(xbzrle_counters.cache= _miss - @@ -1626,7 +1626,7 @@ static int find_dirty_block(RAMState *rs, PageSearchS= tatus *pss) /* Flag that we've looped */ pss->complete_round =3D true; /* After the first round, enable XBZRLE. */ - if (migrate_use_xbzrle()) { + if (migrate_xbzrle()) { rs->xbzrle_enabled =3D true; } } @@ -2979,7 +2979,7 @@ static int xbzrle_init(void) { Error *local_err =3D NULL; =20 - if (!migrate_use_xbzrle()) { + if (!migrate_xbzrle()) { return 0; } =20 --=20 2.39.2