From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BA370C77B72 for ; Thu, 20 Apr 2023 13:42:34 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ppUXC-0005KF-0o; Thu, 20 Apr 2023 09:41: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 1ppUX8-000506-IG for qemu-devel@nongnu.org; Thu, 20 Apr 2023 09:41:11 -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 1ppUX6-00062U-V5 for qemu-devel@nongnu.org; Thu, 20 Apr 2023 09:41:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1681998068; 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=Gixa/TYb0inFga0TuTQz0dtqas6xMuY3pBzeKeTotF8=; b=D/LlPjlX4m00VnTNjY2x7XiECAYCssz5HpOtxNJkEttxsEPKHYMGi5+NEr9PBIoAG+Bnnh A/1Sl9j89UZhCMSf8wVhuJDK72u/rnXVxUtU5MSvTfBR/MElA5LxkfrC1fHbxzNz9GTKm2 SdjhsccsHR+DoP7/dCDVrddA9F5PLRI= 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-235-sOpXWq5gOWSmpcdN3xkMug-1; Thu, 20 Apr 2023 09:41:05 -0400 X-MC-Unique: sOpXWq5gOWSmpcdN3xkMug-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CB7C9280AA2E; Thu, 20 Apr 2023 13:41:04 +0000 (UTC) Received: from secure.mitica (unknown [10.39.192.171]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3B3BE4020BED; Thu, 20 Apr 2023 13:41:02 +0000 (UTC) From: Juan Quintela To: qemu-devel@nongnu.org Cc: Peter Xu , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , David Hildenbrand , John Snow , Fam Zheng , Hailiang Zhang , "Michael S. Tsirkin" , qemu-block@nongnu.org, Gerd Hoffmann , Vladimir Sementsov-Ogievskiy , Leonardo Bras , Markus Armbruster , Stefan Hajnoczi , Juan Quintela , Eric Blake Subject: [PATCH v2 20/43] migration: Move migrate_use_block_incremental() to option.c Date: Thu, 20 Apr 2023 15:39:39 +0200 Message-Id: <20230420134002.29531-21-quintela@redhat.com> In-Reply-To: <20230420134002.29531-1-quintela@redhat.com> References: <20230420134002.29531-1-quintela@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 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=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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org To be consistent with every other parameter, rename to migrate_block_incremental(). Signed-off-by: Juan Quintela --- migration/block.c | 2 +- migration/migration.c | 11 +---------- migration/migration.h | 1 - migration/options.c | 9 +++++++++ migration/options.h | 1 + 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/migration/block.c b/migration/block.c index f0977217cf..6d532ac7a2 100644 --- a/migration/block.c +++ b/migration/block.c @@ -417,7 +417,7 @@ static int init_blk_migration(QEMUFile *f) bmds->bulk_completed = 0; bmds->total_sectors = sectors; bmds->completed_sectors = 0; - bmds->shared_base = migrate_use_block_incremental(); + bmds->shared_base = migrate_block_incremental(); assert(i < num_bs); bmds_bs[i].bmds = bmds; diff --git a/migration/migration.c b/migration/migration.c index 88bcaec08e..dbb89c2e7b 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -2158,7 +2158,7 @@ static bool migrate_prepare(MigrationState *s, bool blk, bool blk_inc, error_setg(errp, "No disk migration is required in COLO mode"); return false; } - if (migrate_block() || migrate_use_block_incremental()) { + if (migrate_block() || migrate_block_incremental()) { error_setg(errp, "Command options are incompatible with " "current migration capabilities"); return false; @@ -2274,15 +2274,6 @@ int migrate_use_tls(void) return s->parameters.tls_creds && *s->parameters.tls_creds; } -bool migrate_use_block_incremental(void) -{ - MigrationState *s; - - s = migrate_get_current(); - - return s->parameters.block_incremental; -} - /* migration thread support */ /* * Something bad happened to the RP stream, mark an error diff --git a/migration/migration.h b/migration/migration.h index 8451e5f2fe..86051af132 100644 --- a/migration/migration.h +++ b/migration/migration.h @@ -451,7 +451,6 @@ bool migrate_postcopy(void); int migrate_use_tls(void); -bool migrate_use_block_incremental(void); int migrate_max_cpu_throttle(void); uint64_t ram_get_total_transferred_pages(void); diff --git a/migration/options.c b/migration/options.c index 8d15be858c..2b6d88b4b9 100644 --- a/migration/options.c +++ b/migration/options.c @@ -463,6 +463,15 @@ void qmp_migrate_set_capabilities(MigrationCapabilityStatusList *params, /* parameters */ +bool migrate_block_incremental(void) +{ + MigrationState *s; + + s = migrate_get_current(); + + return s->parameters.block_incremental; +} + int migrate_compress_level(void) { MigrationState *s; diff --git a/migration/options.h b/migration/options.h index b24ee92283..96d5a8e6e4 100644 --- a/migration/options.h +++ b/migration/options.h @@ -45,6 +45,7 @@ bool migrate_cap_set(int cap, bool value, Error **errp); /* parameters */ +bool migrate_block_incremental(void); int migrate_compress_level(void); int migrate_compress_threads(void); int migrate_compress_wait_thread(void); -- 2.39.2