From nobody Tue Feb 10 13:01:29 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=1682610619; cv=none; d=zohomail.com; s=zohoarc; b=i947ENgg4aQbb0O3LiOEN7F5FuBGk4iPwnHRbWoRXdv32Vxwj/6k58pCirYzLKEmOYu1SUXs4K02xhpZ6rJ7totjPfZsAS8MoZVo5endRbOqsZfQPF8rWnjkR1wwNJBdnBLjPIzmZo/SlREKxm7IEIRpIyub6fEDtMF1MZZiS2E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682610619; 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=5rCbwUMQ+xaJ6xgaKifwGKtFDaA9sxo0D+nMtAHdLRA=; b=kQWpsPFihSgAxGb61XsuyI2cdBDPIgzutnCqiyI0gkzJolYANyayi1909Ru5JioSB4cYmaScKXmKg54dNr541CNe/q84W7CMK+N7cQ43WfoaI4oBbWpJUPELskKWqHmLqKZyKJUKboz0SAt9ZZv5y4dXVC/hvVhisQzajuv1bkA= 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 168261061924793.25818610736849; Thu, 27 Apr 2023 08:50:19 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ps3r4-0008UA-I2; Thu, 27 Apr 2023 11:48: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 1ps3qL-0008Hk-Ra for qemu-devel@nongnu.org; Thu, 27 Apr 2023 11:47:38 -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 1ps3qC-00055u-Af for qemu-devel@nongnu.org; Thu, 27 Apr 2023 11:47:35 -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-590-dfN40ueLOlql0bjfyTHPqA-1; Thu, 27 Apr 2023 11:25:11 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EDCCC8C447E; Thu, 27 Apr 2023 15:22:45 +0000 (UTC) Received: from secure.mitica (unknown [10.39.193.238]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8126D40C2064; Thu, 27 Apr 2023 15:22:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682610439; 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=5rCbwUMQ+xaJ6xgaKifwGKtFDaA9sxo0D+nMtAHdLRA=; b=QuL3sJumuFhBUCSPiFngzpY8vkZd14kimQgBWO3B3mf6VCucF8p8wAOuid5nGihtx3imGE oR01zUgXahRqdCIk3OmvonxrqkVmVh+8EVKWULD5xjCPQ4e1GymPiiNb1BuQoXZFAav09e nqp0M1Y0hOcQb0+pWmEMuehZRpo86pw= X-MC-Unique: dfN40ueLOlql0bjfyTHPqA-1 From: Juan Quintela To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Marcel Apfelbaum , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Eric Blake , Juan Quintela , Peter Xu , John Snow , Yanan Wang , Stefan Hajnoczi , Leonardo Bras , Fam Zheng , Eduardo Habkost , Vladimir Sementsov-Ogievskiy Subject: [PULL 03/18] migration: Make all functions check have the same format Date: Thu, 27 Apr 2023 17:22:19 +0200 Message-Id: <20230427152234.25400-4-quintela@redhat.com> In-Reply-To: <20230427152234.25400-1-quintela@redhat.com> References: <20230427152234.25400-1-quintela@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 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_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01, T_SPF_HELO_TEMPERROR=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: 1682610620764100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Juan Quintela Reviewed-by: Vladimir Sementsov-Ogievskiy --- migration/options.c | 153 +++++++++++--------------------------------- 1 file changed, 39 insertions(+), 114 deletions(-) diff --git a/migration/options.c b/migration/options.c index 552e8d8e5c..0b1b56e68f 100644 --- a/migration/options.c +++ b/migration/options.c @@ -33,27 +33,21 @@ =20 bool migrate_auto_converge(void) { - MigrationState *s; - - s =3D migrate_get_current(); + MigrationState *s =3D migrate_get_current(); =20 return s->capabilities[MIGRATION_CAPABILITY_AUTO_CONVERGE]; } =20 bool migrate_background_snapshot(void) { - MigrationState *s; - - s =3D migrate_get_current(); + MigrationState *s =3D migrate_get_current(); =20 return s->capabilities[MIGRATION_CAPABILITY_BACKGROUND_SNAPSHOT]; } =20 bool migrate_block(void) { - MigrationState *s; - - s =3D migrate_get_current(); + MigrationState *s =3D migrate_get_current(); =20 return s->capabilities[MIGRATION_CAPABILITY_BLOCK]; } @@ -61,95 +55,76 @@ bool migrate_block(void) bool migrate_colo(void) { MigrationState *s =3D migrate_get_current(); + return s->capabilities[MIGRATION_CAPABILITY_X_COLO]; } =20 bool migrate_compress(void) { - MigrationState *s; - - s =3D migrate_get_current(); + MigrationState *s =3D migrate_get_current(); =20 return s->capabilities[MIGRATION_CAPABILITY_COMPRESS]; } =20 bool migrate_dirty_bitmaps(void) { - MigrationState *s; - - s =3D migrate_get_current(); + MigrationState *s =3D migrate_get_current(); =20 return s->capabilities[MIGRATION_CAPABILITY_DIRTY_BITMAPS]; } =20 bool migrate_events(void) { - MigrationState *s; - - s =3D migrate_get_current(); + MigrationState *s =3D migrate_get_current(); =20 return s->capabilities[MIGRATION_CAPABILITY_EVENTS]; } =20 bool migrate_ignore_shared(void) { - MigrationState *s; - - s =3D migrate_get_current(); + MigrationState *s =3D migrate_get_current(); =20 return s->capabilities[MIGRATION_CAPABILITY_X_IGNORE_SHARED]; } =20 bool migrate_late_block_activate(void) { - MigrationState *s; - - s =3D migrate_get_current(); + MigrationState *s =3D migrate_get_current(); =20 return s->capabilities[MIGRATION_CAPABILITY_LATE_BLOCK_ACTIVATE]; } =20 bool migrate_multifd(void) { - MigrationState *s; - - s =3D migrate_get_current(); + MigrationState *s =3D migrate_get_current(); =20 return s->capabilities[MIGRATION_CAPABILITY_MULTIFD]; } =20 bool migrate_pause_before_switchover(void) { - MigrationState *s; - - s =3D migrate_get_current(); + MigrationState *s =3D migrate_get_current(); =20 return s->capabilities[MIGRATION_CAPABILITY_PAUSE_BEFORE_SWITCHOVER]; } =20 bool migrate_postcopy_blocktime(void) { - MigrationState *s; - - s =3D migrate_get_current(); + MigrationState *s =3D migrate_get_current(); =20 return s->capabilities[MIGRATION_CAPABILITY_POSTCOPY_BLOCKTIME]; } =20 bool migrate_postcopy_preempt(void) { - MigrationState *s; - - s =3D migrate_get_current(); + MigrationState *s =3D migrate_get_current(); =20 return s->capabilities[MIGRATION_CAPABILITY_POSTCOPY_PREEMPT]; } =20 bool migrate_postcopy_ram(void) { - MigrationState *s; - - s =3D migrate_get_current(); + MigrationState *s =3D migrate_get_current(); =20 return s->capabilities[MIGRATION_CAPABILITY_POSTCOPY_RAM]; } @@ -163,54 +138,42 @@ bool migrate_rdma_pin_all(void) =20 bool migrate_release_ram(void) { - MigrationState *s; - - s =3D migrate_get_current(); + MigrationState *s =3D migrate_get_current(); =20 return s->capabilities[MIGRATION_CAPABILITY_RELEASE_RAM]; } =20 bool migrate_return_path(void) { - MigrationState *s; - - s =3D migrate_get_current(); + MigrationState *s =3D migrate_get_current(); =20 return s->capabilities[MIGRATION_CAPABILITY_RETURN_PATH]; } =20 bool migrate_validate_uuid(void) { - MigrationState *s; - - s =3D migrate_get_current(); + MigrationState *s =3D migrate_get_current(); =20 return s->capabilities[MIGRATION_CAPABILITY_VALIDATE_UUID]; } =20 bool migrate_xbzrle(void) { - MigrationState *s; - - s =3D migrate_get_current(); + MigrationState *s =3D migrate_get_current(); =20 return s->capabilities[MIGRATION_CAPABILITY_XBZRLE]; } =20 bool migrate_zero_blocks(void) { - MigrationState *s; - - s =3D migrate_get_current(); + MigrationState *s =3D migrate_get_current(); =20 return s->capabilities[MIGRATION_CAPABILITY_ZERO_BLOCKS]; } =20 bool migrate_zero_copy_send(void) { - MigrationState *s; - - s =3D migrate_get_current(); + MigrationState *s =3D migrate_get_current(); =20 return s->capabilities[MIGRATION_CAPABILITY_ZERO_COPY_SEND]; } @@ -224,9 +187,7 @@ bool migrate_postcopy(void) =20 bool migrate_tls(void) { - MigrationState *s; - - s =3D migrate_get_current(); + MigrationState *s =3D migrate_get_current(); =20 return s->parameters.tls_creds && *s->parameters.tls_creds; } @@ -496,126 +457,98 @@ void qmp_migrate_set_capabilities(MigrationCapabilit= yStatusList *params, =20 bool migrate_block_incremental(void) { - MigrationState *s; - - s =3D migrate_get_current(); + MigrationState *s =3D migrate_get_current(); =20 return s->parameters.block_incremental; } =20 uint32_t migrate_checkpoint_delay(void) { - MigrationState *s; - - s =3D migrate_get_current(); + MigrationState *s =3D migrate_get_current(); =20 return s->parameters.x_checkpoint_delay; } =20 int migrate_compress_level(void) { - MigrationState *s; - - s =3D migrate_get_current(); + MigrationState *s =3D migrate_get_current(); =20 return s->parameters.compress_level; } =20 int migrate_compress_threads(void) { - MigrationState *s; - - s =3D migrate_get_current(); + MigrationState *s =3D migrate_get_current(); =20 return s->parameters.compress_threads; } =20 int migrate_compress_wait_thread(void) { - MigrationState *s; - - s =3D migrate_get_current(); + MigrationState *s =3D migrate_get_current(); =20 return s->parameters.compress_wait_thread; } =20 uint8_t migrate_cpu_throttle_increment(void) { - MigrationState *s; - - s =3D migrate_get_current(); + MigrationState *s =3D migrate_get_current(); =20 return s->parameters.cpu_throttle_increment; } =20 uint8_t migrate_cpu_throttle_initial(void) { - MigrationState *s; - - s =3D migrate_get_current(); + MigrationState *s =3D migrate_get_current(); =20 return s->parameters.cpu_throttle_initial; } =20 bool migrate_cpu_throttle_tailslow(void) { - MigrationState *s; - - s =3D migrate_get_current(); + MigrationState *s =3D migrate_get_current(); =20 return s->parameters.cpu_throttle_tailslow; } =20 int migrate_decompress_threads(void) { - MigrationState *s; - - s =3D migrate_get_current(); + MigrationState *s =3D migrate_get_current(); =20 return s->parameters.decompress_threads; } =20 uint8_t migrate_max_cpu_throttle(void) { - MigrationState *s; - - s =3D migrate_get_current(); + MigrationState *s =3D migrate_get_current(); =20 return s->parameters.max_cpu_throttle; } =20 uint64_t migrate_max_bandwidth(void) { - MigrationState *s; - - s =3D migrate_get_current(); + MigrationState *s =3D migrate_get_current(); =20 return s->parameters.max_bandwidth; } =20 int64_t migrate_max_postcopy_bandwidth(void) { - MigrationState *s; - - s =3D migrate_get_current(); + MigrationState *s =3D migrate_get_current(); =20 return s->parameters.max_postcopy_bandwidth; } =20 int migrate_multifd_channels(void) { - MigrationState *s; - - s =3D migrate_get_current(); + MigrationState *s =3D migrate_get_current(); =20 return s->parameters.multifd_channels; } =20 MultiFDCompression migrate_multifd_compression(void) { - MigrationState *s; - - s =3D migrate_get_current(); + MigrationState *s =3D migrate_get_current(); =20 assert(s->parameters.multifd_compression < MULTIFD_COMPRESSION__MAX); return s->parameters.multifd_compression; @@ -623,36 +556,28 @@ MultiFDCompression migrate_multifd_compression(void) =20 int migrate_multifd_zlib_level(void) { - MigrationState *s; - - s =3D migrate_get_current(); + MigrationState *s =3D migrate_get_current(); =20 return s->parameters.multifd_zlib_level; } =20 int migrate_multifd_zstd_level(void) { - MigrationState *s; - - s =3D migrate_get_current(); + MigrationState *s =3D migrate_get_current(); =20 return s->parameters.multifd_zstd_level; } =20 uint8_t migrate_throttle_trigger_threshold(void) { - MigrationState *s; - - s =3D migrate_get_current(); + MigrationState *s =3D migrate_get_current(); =20 return s->parameters.throttle_trigger_threshold; } =20 uint64_t migrate_xbzrle_cache_size(void) { - MigrationState *s; - - s =3D migrate_get_current(); + MigrationState *s =3D migrate_get_current(); =20 return s->parameters.xbzrle_cache_size; } --=20 2.40.0