From nobody Tue Feb 10 10:18:58 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=1681996744; cv=none; d=zohomail.com; s=zohoarc; b=c01rMeVqWmxASRTMXEyLEvBm6ZoPe+eumVNEX0Lqw+Ewr2rhgTXogR8XAKt9DnqVNNBhvY4rB51uzDgncNFR2qAzCQNdrnpzVyj4uiOjpbLs3pK78KLDYXEhXtCOylo5NbWP0ZZnfryp8W1p/coivGIoEL2x9+OyXbm2vjmmUxU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1681996744; 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=beNK2HPiTfpmckPKYaYFis9YWA71zWB5eliN1H6DlkQ=; b=SRL8ZVrqA9xzqU5sD8WJGejLdYSVfjBj3wXYk9FYTRMAyFHtN1koN5Nk1eOTmHnJuRkclXX9TZgXln3Ggd8M989HmAudr3/k6lIoRNEjZxdjoAaTeMxefajvhr7HzRgbreAHS+AnvakoE6pocLcdF92YbXQz5T52CB2WASJSwD8= 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 1681996744576564.2540255622657; Thu, 20 Apr 2023 06:19:04 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ppUBB-0001rE-NW; Thu, 20 Apr 2023 09:18:29 -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 1ppUB3-0001b0-4T for qemu-devel@nongnu.org; Thu, 20 Apr 2023 09:18:21 -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 1ppUAz-0005jS-Ru for qemu-devel@nongnu.org; Thu, 20 Apr 2023 09:18:20 -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-435-sLhkT5ABNjC5aAccZ6WbXg-1; Thu, 20 Apr 2023 09:18:16 -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 9E8B4884EC0; Thu, 20 Apr 2023 13:18:15 +0000 (UTC) Received: from secure.mitica (unknown [10.39.192.171]) by smtp.corp.redhat.com (Postfix) with ESMTP id BBB08C16026; Thu, 20 Apr 2023 13:18:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1681996697; 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=beNK2HPiTfpmckPKYaYFis9YWA71zWB5eliN1H6DlkQ=; b=JlhY+klgkLnkRI0LcXUXPTgFA2sEyyPzI5/3t7/7pjDMZDmEzhzq46xAMKX5+HT9sKXO/L OmRUZKmP+JM8ZfQTUnjfB/u+GbxCTmHikpvRrdZwS2+uPk4PDkcFmgpeEGVczVPLD+kd0Z abGhz2rq7uvfmRtzQV+HRKv9jKEhLzs= X-MC-Unique: sLhkT5ABNjC5aAccZ6WbXg-1 From: Juan Quintela To: qemu-devel@nongnu.org Cc: Juan Quintela , Paolo Bonzini , Vladimir Sementsov-Ogievskiy Subject: [PULL 19/20] migration: rename enabled_capabilities to capabilities Date: Thu, 20 Apr 2023 15:17:50 +0200 Message-Id: <20230420131751.28534-20-quintela@redhat.com> In-Reply-To: <20230420131751.28534-1-quintela@redhat.com> References: <20230420131751.28534-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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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: 1681996746095100003 Content-Type: text/plain; charset="utf-8" It is clear from the context what that means, and such a long name with the extra long names of the capabilities make very difficilut to stay inside the 80 columns limit. Signed-off-by: Juan Quintela Reviewed-by: Vladimir Sementsov-Ogievskiy --- migration/migration.c | 52 +++++++++++++++++++++---------------------- migration/migration.h | 2 +- migration/rdma.c | 4 ++-- migration/savevm.c | 6 ++--- 4 files changed, 31 insertions(+), 33 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index d630193272..0c2376bc7e 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -364,8 +364,7 @@ static bool migrate_late_block_activate(void) =20 s =3D migrate_get_current(); =20 - return s->enabled_capabilities[ - MIGRATION_CAPABILITY_LATE_BLOCK_ACTIVATE]; + return s->capabilities[MIGRATION_CAPABILITY_LATE_BLOCK_ACTIVATE]; } =20 /* @@ -944,7 +943,7 @@ MigrationCapabilityStatusList *qmp_query_migrate_capabi= lities(Error **errp) #endif caps =3D g_malloc0(sizeof(*caps)); caps->capability =3D i; - caps->state =3D s->enabled_capabilities[i]; + caps->state =3D s->capabilities[i]; QAPI_LIST_APPEND(tail, caps); } =20 @@ -1495,13 +1494,13 @@ void qmp_migrate_set_capabilities(MigrationCapabili= tyStatusList *params, return; } =20 - memcpy(cap_list, s->enabled_capabilities, sizeof(cap_list)); + memcpy(cap_list, s->capabilities, sizeof(cap_list)); if (!migrate_caps_check(cap_list, params, errp)) { return; } =20 for (cap =3D params; cap; cap =3D cap->next) { - s->enabled_capabilities[cap->value->capability] =3D cap->value->st= ate; + s->capabilities[cap->value->capability] =3D cap->value->state; } } =20 @@ -2570,7 +2569,7 @@ bool migrate_release_ram(void) =20 s =3D migrate_get_current(); =20 - return s->enabled_capabilities[MIGRATION_CAPABILITY_RELEASE_RAM]; + return s->capabilities[MIGRATION_CAPABILITY_RELEASE_RAM]; } =20 bool migrate_postcopy_ram(void) @@ -2579,7 +2578,7 @@ bool migrate_postcopy_ram(void) =20 s =3D migrate_get_current(); =20 - return s->enabled_capabilities[MIGRATION_CAPABILITY_POSTCOPY_RAM]; + return s->capabilities[MIGRATION_CAPABILITY_POSTCOPY_RAM]; } =20 bool migrate_postcopy(void) @@ -2593,7 +2592,7 @@ bool migrate_auto_converge(void) =20 s =3D migrate_get_current(); =20 - return s->enabled_capabilities[MIGRATION_CAPABILITY_AUTO_CONVERGE]; + return s->capabilities[MIGRATION_CAPABILITY_AUTO_CONVERGE]; } =20 bool migrate_zero_blocks(void) @@ -2602,7 +2601,7 @@ bool migrate_zero_blocks(void) =20 s =3D migrate_get_current(); =20 - return s->enabled_capabilities[MIGRATION_CAPABILITY_ZERO_BLOCKS]; + return s->capabilities[MIGRATION_CAPABILITY_ZERO_BLOCKS]; } =20 bool migrate_postcopy_blocktime(void) @@ -2611,7 +2610,7 @@ bool migrate_postcopy_blocktime(void) =20 s =3D migrate_get_current(); =20 - return s->enabled_capabilities[MIGRATION_CAPABILITY_POSTCOPY_BLOCKTIME= ]; + return s->capabilities[MIGRATION_CAPABILITY_POSTCOPY_BLOCKTIME]; } =20 bool migrate_use_compression(void) @@ -2620,7 +2619,7 @@ bool migrate_use_compression(void) =20 s =3D migrate_get_current(); =20 - return s->enabled_capabilities[MIGRATION_CAPABILITY_COMPRESS]; + return s->capabilities[MIGRATION_CAPABILITY_COMPRESS]; } =20 int migrate_compress_level(void) @@ -2665,7 +2664,7 @@ bool migrate_dirty_bitmaps(void) =20 s =3D migrate_get_current(); =20 - return s->enabled_capabilities[MIGRATION_CAPABILITY_DIRTY_BITMAPS]; + return s->capabilities[MIGRATION_CAPABILITY_DIRTY_BITMAPS]; } =20 bool migrate_ignore_shared(void) @@ -2674,7 +2673,7 @@ bool migrate_ignore_shared(void) =20 s =3D migrate_get_current(); =20 - return s->enabled_capabilities[MIGRATION_CAPABILITY_X_IGNORE_SHARED]; + return s->capabilities[MIGRATION_CAPABILITY_X_IGNORE_SHARED]; } =20 bool migrate_validate_uuid(void) @@ -2683,7 +2682,7 @@ bool migrate_validate_uuid(void) =20 s =3D migrate_get_current(); =20 - return s->enabled_capabilities[MIGRATION_CAPABILITY_VALIDATE_UUID]; + return s->capabilities[MIGRATION_CAPABILITY_VALIDATE_UUID]; } =20 bool migrate_use_events(void) @@ -2692,7 +2691,7 @@ bool migrate_use_events(void) =20 s =3D migrate_get_current(); =20 - return s->enabled_capabilities[MIGRATION_CAPABILITY_EVENTS]; + return s->capabilities[MIGRATION_CAPABILITY_EVENTS]; } =20 bool migrate_use_multifd(void) @@ -2701,7 +2700,7 @@ bool migrate_use_multifd(void) =20 s =3D migrate_get_current(); =20 - return s->enabled_capabilities[MIGRATION_CAPABILITY_MULTIFD]; + return s->capabilities[MIGRATION_CAPABILITY_MULTIFD]; } =20 bool migrate_pause_before_switchover(void) @@ -2710,8 +2709,7 @@ bool migrate_pause_before_switchover(void) =20 s =3D migrate_get_current(); =20 - return s->enabled_capabilities[ - MIGRATION_CAPABILITY_PAUSE_BEFORE_SWITCHOVER]; + return s->capabilities[MIGRATION_CAPABILITY_PAUSE_BEFORE_SWITCHOVER]; } =20 int migrate_multifd_channels(void) @@ -2758,7 +2756,7 @@ bool migrate_use_zero_copy_send(void) =20 s =3D migrate_get_current(); =20 - return s->enabled_capabilities[MIGRATION_CAPABILITY_ZERO_COPY_SEND]; + return s->capabilities[MIGRATION_CAPABILITY_ZERO_COPY_SEND]; } #endif =20 @@ -2777,7 +2775,7 @@ int migrate_use_xbzrle(void) =20 s =3D migrate_get_current(); =20 - return s->enabled_capabilities[MIGRATION_CAPABILITY_XBZRLE]; + return s->capabilities[MIGRATION_CAPABILITY_XBZRLE]; } =20 uint64_t migrate_xbzrle_cache_size(void) @@ -2804,7 +2802,7 @@ bool migrate_use_block(void) =20 s =3D migrate_get_current(); =20 - return s->enabled_capabilities[MIGRATION_CAPABILITY_BLOCK]; + return s->capabilities[MIGRATION_CAPABILITY_BLOCK]; } =20 bool migrate_use_return_path(void) @@ -2813,7 +2811,7 @@ bool migrate_use_return_path(void) =20 s =3D migrate_get_current(); =20 - return s->enabled_capabilities[MIGRATION_CAPABILITY_RETURN_PATH]; + return s->capabilities[MIGRATION_CAPABILITY_RETURN_PATH]; } =20 bool migrate_use_block_incremental(void) @@ -2831,7 +2829,7 @@ bool migrate_background_snapshot(void) =20 s =3D migrate_get_current(); =20 - return s->enabled_capabilities[MIGRATION_CAPABILITY_BACKGROUND_SNAPSHO= T]; + return s->capabilities[MIGRATION_CAPABILITY_BACKGROUND_SNAPSHOT]; } =20 bool migrate_postcopy_preempt(void) @@ -2840,7 +2838,7 @@ bool migrate_postcopy_preempt(void) =20 s =3D migrate_get_current(); =20 - return s->enabled_capabilities[MIGRATION_CAPABILITY_POSTCOPY_PREEMPT]; + return s->capabilities[MIGRATION_CAPABILITY_POSTCOPY_PREEMPT]; } =20 /* migration thread support */ @@ -3582,7 +3580,7 @@ fail: bool migrate_colo_enabled(void) { MigrationState *s =3D migrate_get_current(); - return s->enabled_capabilities[MIGRATION_CAPABILITY_X_COLO]; + return s->capabilities[MIGRATION_CAPABILITY_X_COLO]; } =20 typedef enum MigThrError { @@ -4448,7 +4446,7 @@ void migration_global_dump(Monitor *mon) } =20 #define DEFINE_PROP_MIG_CAP(name, x) \ - DEFINE_PROP_BOOL(name, MigrationState, enabled_capabilities[x], false) + DEFINE_PROP_BOOL(name, MigrationState, capabilities[x], false) =20 static Property migration_properties[] =3D { DEFINE_PROP_BOOL("store-global-state", MigrationState, @@ -4647,7 +4645,7 @@ static bool migration_object_check(MigrationState *ms= , Error **errp) } =20 for (i =3D 0; i < MIGRATION_CAPABILITY__MAX; i++) { - if (ms->enabled_capabilities[i]) { + if (ms->capabilities[i]) { QAPI_LIST_PREPEND(head, migrate_cap_add(i, true)); } } diff --git a/migration/migration.h b/migration/migration.h index 310ae8901b..04e0860b4e 100644 --- a/migration/migration.h +++ b/migration/migration.h @@ -310,7 +310,7 @@ struct MigrationState { int64_t downtime_start; int64_t downtime; int64_t expected_downtime; - bool enabled_capabilities[MIGRATION_CAPABILITY__MAX]; + bool capabilities[MIGRATION_CAPABILITY__MAX]; int64_t setup_time; /* * Whether guest was running when we enter the completion stage. diff --git a/migration/rdma.c b/migration/rdma.c index df646be35e..f35f021963 100644 --- a/migration/rdma.c +++ b/migration/rdma.c @@ -4179,7 +4179,7 @@ void rdma_start_outgoing_migration(void *opaque, } =20 ret =3D qemu_rdma_source_init(rdma, - s->enabled_capabilities[MIGRATION_CAPABILITY_RDMA_PIN_ALL], errp); + s->capabilities[MIGRATION_CAPABILITY_RDMA_PIN_ALL], errp); =20 if (ret) { goto err; @@ -4201,7 +4201,7 @@ void rdma_start_outgoing_migration(void *opaque, } =20 ret =3D qemu_rdma_source_init(rdma_return_path, - s->enabled_capabilities[MIGRATION_CAPABILITY_RDMA_PIN_ALL], er= rp); + s->capabilities[MIGRATION_CAPABILITY_RDMA_PIN_ALL], errp); =20 if (ret) { goto return_path_err; diff --git a/migration/savevm.c b/migration/savevm.c index aa54a67fda..589ef926ab 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -253,7 +253,7 @@ static uint32_t get_validatable_capabilities_count(void) uint32_t result =3D 0; int i; for (i =3D 0; i < MIGRATION_CAPABILITY__MAX; i++) { - if (should_validate_capability(i) && s->enabled_capabilities[i]) { + if (should_validate_capability(i) && s->capabilities[i]) { result++; } } @@ -275,7 +275,7 @@ static int configuration_pre_save(void *opaque) state->capabilities =3D g_renew(MigrationCapability, state->capabiliti= es, state->caps_count); for (i =3D j =3D 0; i < MIGRATION_CAPABILITY__MAX; i++) { - if (should_validate_capability(i) && s->enabled_capabilities[i]) { + if (should_validate_capability(i) && s->capabilities[i]) { state->capabilities[j++] =3D i; } } @@ -325,7 +325,7 @@ static bool configuration_validate_capabilities(SaveSta= te *state) continue; } source_state =3D test_bit(i, source_caps_bm); - target_state =3D s->enabled_capabilities[i]; + target_state =3D s->capabilities[i]; if (source_state !=3D target_state) { error_report("Capability %s is %s, but received capability is = %s", MigrationCapability_str(i), --=20 2.39.2