From nobody Tue Oct 28 17:30:16 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1760363095; cv=none; d=zohomail.com; s=zohoarc; b=P8iNgSg1JIQ3Jm9WbE5Bj4CmU8FDjhyvoLnPNXAKBkOvN8lxUUqAyWQp5T/nhZr0FGaVgLkoCO3AQg40g6DF1poO1Ky0tSVstpNGsCkQ4sKP3KtoaecUKNxCPHp6ilB2yIs6nYqm4ofhacs0jiqVVZm6oy6hg9UWwASZlYkPTiY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760363095; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=TMZfg7FJuIG1P1edQUIwmzProoILtON/iqGCQBwcbmE=; b=PSqSNBDQcYCBd1QSRVrgSq2ltZ31GVHIHU7/URU2L5Vdh7xntlPioeRmHmf70P/1wtLD+GrWnYEGwPN9MgF6/MjhsecgCZBz0z3oNgnBA8VJeDLjcnrE3A0d7BaInxbQv+MchSBdy9uUZuguu+nU3VzhuPMclPe5nfySXNXW1BU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 17603630952739.126578648896384; Mon, 13 Oct 2025 06:44:55 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id A076A3F299; Mon, 13 Oct 2025 09:44:52 -0400 (EDT) Received: from [172.19.199.20] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 22EAC41BE7; Mon, 13 Oct 2025 09:41:31 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id E855C43FD5; Mon, 13 Oct 2025 09:41:08 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 851A943FE7 for ; Mon, 13 Oct 2025 09:41:06 -0400 (EDT) Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-694-r6_dr-cvO9a9HfGQ68McNg-1; Mon, 13 Oct 2025 09:41:04 -0400 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8FBA01800293 for ; Mon, 13 Oct 2025 13:41:03 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.15]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id DE5B71800578 for ; Mon, 13 Oct 2025 13:41:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1760362865; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TMZfg7FJuIG1P1edQUIwmzProoILtON/iqGCQBwcbmE=; b=UUdJb9xKmYJOsRuk1yQ3SPGocC4lAtSt5ePHvOtWFDT5uVpQVsY33Caf6aeFQjk9ABzY9U jvAdY/O2M2W37ZSsgyWtAV2177rUKAR8kjv+d5QcwB1OwTbAmFU3UKhIfyZgK0++pDxgd2 nAEoX5Ogj0OTxsRmcEe7UY98d69BOwM= X-MC-Unique: r6_dr-cvO9a9HfGQ68McNg-1 X-Mimecast-MFC-AGG-ID: r6_dr-cvO9a9HfGQ68McNg_1760362863 To: devel@lists.libvirt.org Subject: [PATCH 4/7] qemu: migration: Don't reactivate block nodes after migration failure any more Date: Mon, 13 Oct 2025 15:40:53 +0200 Message-ID: <8ba5b5f1c8b49f7ff3ec6a8422a0859308a9b465.1760362814.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: wiYzphr-xjKPkVoWInFPURHP_ThaLMZ30AbIwwLaxAY_1760362863 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 523J74PBSPS2BRPYXVJVVS7DUHAU3N3P X-Message-ID-Hash: 523J74PBSPS2BRPYXVJVVS7DUHAU3N3P X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1760363097061154100 Content-Type: text/plain; charset="utf-8" From: Peter Krempa The other code paths which do want to issue block jobs can reactivate the nodes when necessary so we don't need to do that unconditionally after failed/cancelled migration. Signed-off-by: Peter Krempa --- src/qemu/qemu_migration.c | 50 ++------------------------------------- 1 file changed, 2 insertions(+), 48 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index a11d1d8452..9109c4526d 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -220,43 +220,6 @@ qemuMigrationSrcStoreDomainState(virDomainObj *vm) } -/** - * qemuMigrationBlockNodesReactivate: - * - * In case when we're keeping the VM paused qemu will not re-activate the = block - * device backend tree so blockjobs would fail. In case when qemu supports= the - * 'blockdev-set-active' command this function will re-activate the block = nodes. - */ -static void -qemuMigrationBlockNodesReactivate(virDomainObj *vm, - virDomainAsyncJob asyncJob) -{ - virErrorPtr orig_err; - qemuDomainObjPrivate *priv =3D vm->privateData; - int rc; - - if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV_SET_ACTIVE)) - return; - - VIR_DEBUG("re-activating block nodes"); - - virErrorPreserveLast(&orig_err); - - if (qemuDomainObjEnterMonitorAsync(vm, asyncJob) < 0) - goto cleanup; - - rc =3D qemuMonitorBlockdevSetActive(priv->mon, NULL, true); - - qemuDomainObjExitMonitor(vm); - - if (rc < 0) - VIR_WARN("failed to re-activate block nodes after migration of VM = '%s'", vm->def->name); - - cleanup: - virErrorRestore(&orig_err); -} - - static void qemuMigrationSrcRestoreDomainState(virQEMUDriver *driver, virDomainObj *vm) { @@ -279,11 +242,11 @@ qemuMigrationSrcRestoreDomainState(virQEMUDriver *dri= ver, virDomainObj *vm) if (preMigrationState !=3D VIR_DOMAIN_RUNNING || state !=3D VIR_DOMAIN_PAUSED) - goto reactivate; + return; if (reason =3D=3D VIR_DOMAIN_PAUSED_IOERROR) { VIR_DEBUG("Domain is paused due to I/O error, skipping resume"); - goto reactivate; + return; } VIR_DEBUG("Restoring pre-migration state due to migration error"); @@ -306,14 +269,7 @@ qemuMigrationSrcRestoreDomainState(virQEMUDriver *driv= er, virDomainObj *vm) VIR_DOMAIN_EVENT_SUS= PENDED_API_ERROR); virObjectEventStateQueue(driver->domainEventState, event); } - - goto reactivate; } - - return; - - reactivate: - qemuMigrationBlockNodesReactivate(vm, VIR_ASYNC_JOB_MIGRATION_OUT); } @@ -6891,8 +6847,6 @@ qemuMigrationDstFinishFresh(virQEMUDriver *driver, if (*inPostCopy) *doKill =3D false; - } else { - qemuMigrationBlockNodesReactivate(vm, VIR_ASYNC_JOB_MIGRATION_IN); } if (mig->jobData) { --=20 2.51.0