From nobody Mon Feb 9 11:47:03 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1697543585; cv=none; d=zohomail.com; s=zohoarc; b=grRqa2QyGMs4pa0u3W0FX1ePRZ5NizkoFBl3Sl9eEAD1v5zkye5A6THfLB1BtLcql5yMsQgbTj/5rKofNYPzM73M0XrpwaNUlD2vDDmSytEI8oWKTxN59XkS1QfxZZq9F+bujxkd7wvsxW/CjzA8D2kV4FJjeraABxyS9ast6NQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1697543585; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=96sXareEzivDc8DjJq1hued/pCJZ9cpHZ6xjlPCp5jI=; b=OV79+VUa4nEIlOpBE5LXZmTTR34SvUb98z/yO3p/pLlynmPdeaNQBG4MT52M3N/vnTa49Mp9lC8OrPNZ9EKfYVVmvAmWVA9tIKrNKbx4US4Eam49ABRItuwALSXKKGukbISRk1PYEeOUZcz3Hj2MoApS0SqcfarkgP8wiBmo+/g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 169754358518418.386521785714876; Tue, 17 Oct 2023 04:53:05 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx-ext.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-104-TfH9tJwvOYa4wFsvuR1kQw-1; Tue, 17 Oct 2023 07:53:00 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 167573C176F3; Tue, 17 Oct 2023 11:52:58 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id F188525CA; Tue, 17 Oct 2023 11:52:57 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id E188019466ED; Tue, 17 Oct 2023 11:52:57 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 8AB4619465B8 for ; Tue, 17 Oct 2023 11:52:57 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 6ABCA492B05; Tue, 17 Oct 2023 11:52:57 +0000 (UTC) Received: from secure.mitica (unknown [10.39.194.127]) by smtp.corp.redhat.com (Postfix) with ESMTP id 618C2492BFA; Tue, 17 Oct 2023 11:52:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697543584; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=96sXareEzivDc8DjJq1hued/pCJZ9cpHZ6xjlPCp5jI=; b=TRPKc7AMeBQsheIxDP6ycDfKqwbaBuxtIUwEKEMaLetU6ddlSAiFiocc/rB2MXoS3eoFyJ zwlZz/L63LtNVpYHGWeVurWYO8Aa+XlxImtMrXF5Xl3FhHVE4azyq3t+nEBh9cRdQr0kd3 wzAJnuH7zngrPZdwYbBsjDzUKAfIyXc= X-MC-Unique: TfH9tJwvOYa4wFsvuR1kQw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v5 7/7] [RFC] migration: Remove helpers needed for -i/-b migrate options Date: Tue, 17 Oct 2023 13:52:38 +0200 Message-ID: <20231017115238.18309-8-quintela@redhat.com> In-Reply-To: <20231017115238.18309-1-quintela@redhat.com> References: <20231017115238.18309-1-quintela@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.10 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Fabiano Rosas , qemu-block@nongnu.org, Juan Quintela , libvir-list@redhat.com, Markus Armbruster , Peter Xu , Leonardo Bras , Stefan Hajnoczi , Eric Blake Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1697543586538100003 Content-Type: text/plain; charset="utf-8"; x-default="true" [DON'T MERGE] We were abusing capabilities and parameters to implement -i/-b. Previous patch convert that options into one error. Remove all the helpers needed to implement them. Signed-off-by: Juan Quintela --- migration/migration.h | 4 ---- migration/options.h | 6 ------ migration/migration.c | 2 -- migration/options.c | 41 ----------------------------------------- 4 files changed, 53 deletions(-) diff --git a/migration/migration.h b/migration/migration.h index ae82004892..937a3534c5 100644 --- a/migration/migration.h +++ b/migration/migration.h @@ -382,10 +382,6 @@ struct MigrationState { /* mutex to protect errp */ QemuMutex error_mutex; =20 - /* Do we have to clean up -b/-i from old migrate parameters */ - /* This feature is deprecated and will be removed */ - bool must_remove_block_options; - /* * Global switch on whether we need to store the global state * during migration. diff --git a/migration/options.h b/migration/options.h index 237f2d6b4a..e41ea38322 100644 --- a/migration/options.h +++ b/migration/options.h @@ -62,7 +62,6 @@ bool migrate_tls(void); /* capabilities helpers */ =20 bool migrate_caps_check(bool *old_caps, bool *new_caps, Error **errp); -bool migrate_cap_set(int cap, bool value, Error **errp); =20 /* parameters */ =20 @@ -93,14 +92,9 @@ const char *migrate_tls_creds(void); const char *migrate_tls_hostname(void); uint64_t migrate_xbzrle_cache_size(void); =20 -/* parameters setters */ - -void migrate_set_block_incremental(bool value); - /* parameters helpers */ =20 bool migrate_params_check(MigrationParameters *params, Error **errp); void migrate_params_init(MigrationParameters *params); -void block_cleanup_parameters(void); =20 #endif diff --git a/migration/migration.c b/migration/migration.c index 9a695299ba..9792bd98ca 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1205,7 +1205,6 @@ static void migrate_fd_cleanup(MigrationState *s) error_report_err(error_copy(s->error)); } notifier_list_notify(&migration_state_notifiers, s); - block_cleanup_parameters(); yank_unregister_instance(MIGRATION_YANK_INSTANCE); } =20 @@ -1715,7 +1714,6 @@ void qmp_migrate(const char *uri, bool has_blk, bool = blk, "a valid migration protocol"); migrate_set_state(&s->state, MIGRATION_STATUS_SETUP, MIGRATION_STATUS_FAILED); - block_cleanup_parameters(); } =20 if (local_err) { diff --git a/migration/options.c b/migration/options.c index 7cb99a82a5..3be7e35f40 100644 --- a/migration/options.c +++ b/migration/options.c @@ -631,26 +631,6 @@ bool migrate_caps_check(bool *old_caps, bool *new_caps= , Error **errp) return true; } =20 -bool migrate_cap_set(int cap, bool value, Error **errp) -{ - MigrationState *s =3D migrate_get_current(); - bool new_caps[MIGRATION_CAPABILITY__MAX]; - - if (migration_is_running(s->state)) { - error_setg(errp, QERR_MIGRATION_ACTIVE); - return false; - } - - memcpy(new_caps, s->capabilities, sizeof(new_caps)); - new_caps[cap] =3D value; - - if (!migrate_caps_check(s->capabilities, new_caps, errp)) { - return false; - } - s->capabilities[cap] =3D value; - return true; -} - MigrationCapabilityStatusList *qmp_query_migrate_capabilities(Error **errp) { MigrationCapabilityStatusList *head =3D NULL, **tail =3D &head; @@ -877,29 +857,8 @@ uint64_t migrate_xbzrle_cache_size(void) return s->parameters.xbzrle_cache_size; } =20 -/* parameter setters */ - -void migrate_set_block_incremental(bool value) -{ - MigrationState *s =3D migrate_get_current(); - - s->parameters.block_incremental =3D value; -} - /* parameters helpers */ =20 -void block_cleanup_parameters(void) -{ - MigrationState *s =3D migrate_get_current(); - - if (s->must_remove_block_options) { - /* setting to false can never fail */ - migrate_cap_set(MIGRATION_CAPABILITY_BLOCK, false, &error_abort); - migrate_set_block_incremental(false); - s->must_remove_block_options =3D false; - } -} - AnnounceParameters *migrate_announce_params(void) { static AnnounceParameters ap; --=20 2.41.0