From nobody Sun Feb 8 23:26:28 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=1697468537; cv=none; d=zohomail.com; s=zohoarc; b=i8cnvaUgzauuQzbNGURN8RCxY1DwYg1OsLYM4kA56vpFtQPV0VDsZaveJyBAVMhLPra30mn/gc41osMXYqJgGcE7Pa1I3KQaiDUVYSutMnBX/6fFN0gpDNYPVVkuN5gj9ryjOCJ2eWs2eYi9jQqep8GH9/MaO++HKNWHWd5sBcM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1697468537; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=Q48D9n3WrwIgWHj/8gr+D/SqvoQ6azPqpkjWrc+5oB0=; b=ECX3GlYZSICdfYtsvl6H/B1+eNfJYFp8RONohkqKmxXzCElOotYp3MKyg2U1TJ3sAZH/94sMuNPfPXdWyN+or5UqH6tr7zYFVIHkGD7uxQAcCHTRlSK4CLupIJNHUAM5B6/mwrmj5+vhpZbeJqEDCFbk2gIkBOFlXPR0hDyA8PQ= 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 169746853709564.17113433265911; Mon, 16 Oct 2023 08:02:17 -0700 (PDT) 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-504-ULjdUor4NpCFsQ-BxcV8wQ-1; Mon, 16 Oct 2023 11:02:12 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (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 5A598185AD39; Mon, 16 Oct 2023 15:02:04 +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 44EDB1005B8E; Mon, 16 Oct 2023 15:02:04 +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 22B0A1946588; Mon, 16 Oct 2023 15:02:04 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id DD8921946587 for ; Mon, 16 Oct 2023 15:02:01 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id BFD1240C6F7F; Mon, 16 Oct 2023 15:02:01 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4519140C6F79 for ; Mon, 16 Oct 2023 15:02:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697468536; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=Q48D9n3WrwIgWHj/8gr+D/SqvoQ6azPqpkjWrc+5oB0=; b=hZozV1cKmAqaC0m4uosYaKsd82UcWFrjZUXXA7xpeMd6qh7FLfYnWwnMiXRDkPichbbHxs zJzfmknD8zwfU1cVxHLB0lZ8ahBrY+nBHdJaUxC8i3863tmU0TTZ838DEBhL7o8OjWIvps +yJHHuqRJ8Aer0HvNO8a38u+yn61nAA= X-MC-Unique: ULjdUor4NpCFsQ-BxcV8wQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 01/31] qemu: domain: Identify blockjobs by storage nodename in VM status XML Date: Mon, 16 Oct 2023 17:01:28 +0200 Message-ID: <9899e86e154eadf1fd57fabe30c5c0d44ab1371a.1697468414.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 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: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 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: 1697468537922100001 Content-Type: text/plain; charset="utf-8" Use the node name of the storage access driver to identify the block job volumes. This will prepare the blockjob code to the possibility that the format layer may be missing. Our lookup code can find either of them, thus we can safely switch. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_domain.c | 8 ++++---- tests/qemustatusxml2xmldata/blockjob-blockdev-in.xml | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index eec7bed28b..918b5a14e1 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2288,13 +2288,13 @@ qemuDomainPrivateBlockJobFormatCommit(qemuBlockJobD= ata *job, g_auto(virBuffer) disabledBitmapsBuf =3D VIR_BUFFER_INIT_CHILD(buf); if (job->data.commit.base) - virBufferAsprintf(buf, "\n", job->data.commit.b= ase->nodeformat); + virBufferAsprintf(buf, "\n", job->data.commit.b= ase->nodestorage); if (job->data.commit.top) - virBufferAsprintf(buf, "\n", job->data.commit.to= p->nodeformat); + virBufferAsprintf(buf, "\n", job->data.commit.to= p->nodestorage); if (job->data.commit.topparent) - virBufferAsprintf(buf, "\n", job->data.com= mit.topparent->nodeformat); + virBufferAsprintf(buf, "\n", job->data.com= mit.topparent->nodestorage); if (job->data.commit.deleteCommittedImages) virBufferAddLit(buf, "\n"); @@ -2357,7 +2357,7 @@ qemuDomainObjPrivateXMLFormatBlockjobIterator(void *p= ayload, switch ((qemuBlockJobType) job->type) { case QEMU_BLOCKJOB_TYPE_PULL: if (job->data.pull.base) - virBufferAsprintf(&childBuf, "\n", job-= >data.pull.base->nodeformat); + virBufferAsprintf(&childBuf, "\n", job-= >data.pull.base->nodestorage); break; case QEMU_BLOCKJOB_TYPE_COMMIT: diff --git a/tests/qemustatusxml2xmldata/blockjob-blockdev-in.xml b/tests/q= emustatusxml2xmldata/blockjob-blockdev-in.xml index b62b3149c2..380ef053d2 100644 --- a/tests/qemustatusxml2xmldata/blockjob-blockdev-in.xml +++ b/tests/qemustatusxml2xmldata/blockjob-blockdev-in.xml @@ -238,14 +238,14 @@ - - - + + + - - + + @@ -301,7 +301,7 @@ - + --=20 2.41.0