From nobody Mon Feb 9 12:11:16 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=1697468584; cv=none; d=zohomail.com; s=zohoarc; b=B6BbQDblNCylFBKrhP9p9Ao2wPvm0NnWZBLHw3qsJPdVavIEROQ1dxj7bTY5PpxDYePTmUdAK24gS5mjsOKzRJykJrnKxWssV8QnVaYwFj2WOJn8vljMPlCS0EuEKDNpvQeCBpMguo2CsVRn+nyNAH+wdiq6xQ8faWSv8wC7q/4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1697468584; 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=0jlAvMX1lz+AHr+P1Q3t++WMOVyg5ODuZg6fzlkLZzk=; b=bOiPlizHaUsG6lhC39c2PtBVfyvgmltpwh9EhYyZWVIjPnuLwyQLE5mofvxwU0WTJVmx0eqJczVU00DYZVIbkalqhsjJf+6jxl0ItYQGvSq9JpzALfPxJqLjIkgWKH9BXxyyFh0FM5CprrB9jpUKJ8ZIepSY2tFftIAKFftivLg= 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 1697468584544170.19969173237018; Mon, 16 Oct 2023 08:03:04 -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-668-VM1UWyQeM9qjQvBrR1QoPA-1; Mon, 16 Oct 2023 11:02:29 -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 4423E858285; Mon, 16 Oct 2023 15:02:09 +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 2BFBD8C7; Mon, 16 Oct 2023 15:02:09 +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 1A19F1946588; Mon, 16 Oct 2023 15:02:09 +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 F24D119465A2 for ; Mon, 16 Oct 2023 15:02:07 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id D470E40C6CA3; Mon, 16 Oct 2023 15:02:07 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id 550CE40C6CA0 for ; Mon, 16 Oct 2023 15:02:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697468583; 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=0jlAvMX1lz+AHr+P1Q3t++WMOVyg5ODuZg6fzlkLZzk=; b=OrBpQ0jGTOi0IIpM27u4q/g+K2LzZj/YnXaWez6UywQGlH5DK77EGqxAigH2anGZBLlCn/ MUUmJuSHnlwUcPZksp7q31My1/DyJa0hfrE7A5cVbqZcth1loKBXVLpgoPXkLn4nG6/Eoo Avt08ppZPcl6eWjS48LtO0QXFq4iuyQ= X-MC-Unique: VM1UWyQeM9qjQvBrR1QoPA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 08/31] qemu: domain: Convert the status XML code for 'storage' nodenames to new accessors Date: Mon, 16 Oct 2023 17:01:35 +0200 Message-ID: <0d164fa81838758b93e39112a54860d6071803c4.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.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: 1697468586357100002 Content-Type: text/plain; charset="utf-8" Use the new accessors in the private XML formatters and parsers and the recovery code. Specifically in all instances we use the proper (not effective) storage nodename. In the virStorageSource private data it is what we need to store. In blockjobs status XML it simply serves us to find the appropriate 'virStorageSource' struct so using the storage layer node name is simpler. Signed-off-by: Peter Krempa --- src/qemu/qemu_domain.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index f891defa91..78dc99d243 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2000,7 +2000,7 @@ qemuStorageSourcePrivateDataParse(xmlXPathContextPtr = ctxt, int enccount; xmlNodePtr nbdkitnode =3D NULL; - src->nodestorage =3D virXPathString("string(./nodenames/nodename[@type= =3D'storage']/@name)", ctxt); + qemuBlockStorageSourceSetStorageNodename(src, virXPathString("string(.= /nodenames/nodename[@type=3D'storage']/@name)", ctxt)); src->nodeformat =3D virXPathString("string(./nodenames/nodename[@type= =3D'format']/@name)", ctxt); src->tlsAlias =3D virXPathString("string(./objects/TLSx509/@alias)", c= txt); @@ -2111,7 +2111,7 @@ qemuStorageSourcePrivateDataFormat(virStorageSource *= src, g_auto(virBuffer) objectsChildBuf =3D VIR_BUFFER_INIT_CHILD(buf); g_auto(virBuffer) fdsetsChildBuf =3D VIR_BUFFER_INIT_CHILD(buf); - virBufferEscapeString(&nodenamesChildBuf, "\n", src->nodestorage); + virBufferEscapeString(&nodenamesChildBuf, "\n", qemuBlockStorageSourceGetStorageNodename(src)); virBufferEscapeString(&nodenamesChildBuf, "\n", src->nodeformat); if (src->sliceStorage) @@ -2288,13 +2288,16 @@ 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->nodestorage); + virBufferAsprintf(buf, "\n", + qemuBlockStorageSourceGetStorageNodename(job->da= ta.commit.base)); if (job->data.commit.top) - virBufferAsprintf(buf, "\n", job->data.commit.to= p->nodestorage); + virBufferAsprintf(buf, "\n", + qemuBlockStorageSourceGetStorageNodename(job->da= ta.commit.top)); if (job->data.commit.topparent) - virBufferAsprintf(buf, "\n", job->data.com= mit.topparent->nodestorage); + virBufferAsprintf(buf, "\n", + qemuBlockStorageSourceGetStorageNodename(job->da= ta.commit.topparent)); if (job->data.commit.deleteCommittedImages) virBufferAddLit(buf, "\n"); @@ -2357,7 +2360,8 @@ 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->nodestorage); + virBufferAsprintf(&childBuf, "\n", + qemuBlockStorageSourceGetStorageNodename= (job->data.pull.base)); break; case QEMU_BLOCKJOB_TYPE_COMMIT: @@ -6060,8 +6064,8 @@ qemuDomainDeviceHostdevDefPostParseRestoreBackendAlia= s(virDomainHostdevDef *host return -1; } - if (!src->nodestorage) - src->nodestorage =3D g_strdup_printf("libvirt-%s-backend", hostdev= ->info->alias); + if (!qemuBlockStorageSourceGetStorageNodename(src)) + qemuBlockStorageSourceSetStorageNodename(src, g_strdup_printf("lib= virt-%s-backend", hostdev->info->alias)); return 0; } --=20 2.41.0