From nobody Mon Feb 9 23:58:06 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=1682361564; cv=none; d=zohomail.com; s=zohoarc; b=EvfP10CRjAp2ExMpvAsGdxY7Wtveqqcvj9DxXqFYQaphlvoHs+SnC475PSVEeLt29+wSQ8SrOKaQ6d7Milg2DgYHRvUqURvm8j6wDxt4RfUbkrDXSrXYaLAsMRc18SrZZommQ2zi3wEepHCdS05AObThVsQZ0QiB4zVtlKy9pdI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682361564; 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=E64Tn40zeWovsq6afcHVPSfGlPhrtCj7a7by9LoPZNg=; b=lOM2yua5MFyOB2pCCxMihyA6NJDJhoKu7Qnf59p2oE8dyGZKBqPqipaEYI8JJ7+DI4NW8MEsnGkSDBNGZrHWs/W8Tuix7jUe6ZBHaARXD7JP368Cj1eqRMIwIXnsiOwpSZ4+GeEIEZ921T84s9hoSEw+VdL/sozb5Y/2E79Ga84= 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 1682361564054136.69765469292827; Mon, 24 Apr 2023 11: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 1pr0zz-0000N4-FU; Mon, 24 Apr 2023 14:33: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 1pr0zr-0000IZ-RA for qemu-devel@nongnu.org; Mon, 24 Apr 2023 14:33:08 -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 1pr0zj-0005fP-Pt for qemu-devel@nongnu.org; Mon, 24 Apr 2023 14:33:07 -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-215-Y6MK6emwN2yXrscCbccmMQ-1; Mon, 24 Apr 2023 14:32:53 -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 D1034858F09; Mon, 24 Apr 2023 18:32:52 +0000 (UTC) Received: from secure.mitica (unknown [10.39.192.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id 404DAC15BA0; Mon, 24 Apr 2023 18:32:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682361176; 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=E64Tn40zeWovsq6afcHVPSfGlPhrtCj7a7by9LoPZNg=; b=cDn1qqBvaxXTcp6CS9389GlPYqqqa/CH3M+5AAl/D/UY+rjBURDxoYRFz66OHWdiqz8ThE fnu3VPHswXVoNjC16n27A/84ko6GTg4YVIHWHHMV7qfPetaVIR4NSy/LaY40o1Q2YEAybf VU9kzBG4DHfsjUcSg0zLDji26cq621w= X-MC-Unique: Y6MK6emwN2yXrscCbccmMQ-1 From: Juan Quintela To: qemu-devel@nongnu.org Cc: Vladimir Sementsov-Ogievskiy , Leonardo Bras , Stefan Hajnoczi , Fam Zheng , Juan Quintela , qemu-block@nongnu.org, Peter Xu , Eric Blake , John Snow Subject: [PATCH v3 07/13] migration: Move block_cleanup_parameters() to options.c Date: Mon, 24 Apr 2023 20:32:30 +0200 Message-Id: <20230424183236.74561-8-quintela@redhat.com> In-Reply-To: <20230424183236.74561-1-quintela@redhat.com> References: <20230424183236.74561-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: -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=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: 1682361566050100003 Content-Type: text/plain; charset="utf-8" Signed-off-by: Juan Quintela Reviewed-by: Vladimir Sementsov-Ogievskiy --- migration/migration.c | 10 ---------- migration/options.c | 10 ++++++++++ migration/options.h | 1 + 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index 9a42f73aeb..cefe6da2b8 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1164,16 +1164,6 @@ void migrate_set_state(int *state, int old_state, in= t new_state) } } =20 -static void block_cleanup_parameters(MigrationState *s) -{ - 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; - } -} - static void migrate_fd_cleanup(MigrationState *s) { qemu_bh_delete(s->cleanup_bh); diff --git a/migration/options.c b/migration/options.c index 37f7051d9d..26fe00799b 100644 --- a/migration/options.c +++ b/migration/options.c @@ -597,6 +597,16 @@ void migrate_set_block_incremental(bool value) =20 /* parameters helpers */ =20 +void block_cleanup_parameters(MigrationState *s) +{ + 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; diff --git a/migration/options.h b/migration/options.h index d261a25441..1fc8d341dd 100644 --- a/migration/options.h +++ b/migration/options.h @@ -90,5 +90,6 @@ void migrate_set_block_incremental(bool value); =20 bool migrate_params_check(MigrationParameters *params, Error **errp); void migrate_params_init(MigrationParameters *params); +void block_cleanup_parameters(MigrationState *s); =20 #endif --=20 2.39.2