From nobody Mon Feb 9 10:50:02 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=1697468591; cv=none; d=zohomail.com; s=zohoarc; b=TRDJ4iCGIbBK6b85Z319wTBjgcDXJtSWqZLZJBNrpZ7CLWH+R9sOydrmrxCHbIpOimiIGuPDmRPpElsL43PRKswC7+wQeEMHMHdFtsmVQQjlqi+SGc3CwHlo/2Pw532hkokG2KTS2VO1MZ0MVsrLdwK6dofB6jrd4cPsR+0uPuo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1697468591; 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=HIQSzfNRm5I1wh+2FLrIlKPIPs7kKgTeWJDxH/VBuQc=; b=W2Zj7QXB5fAx6dx0mxQs6Xnp6qmLWXQiB/azeyElV5Rzhsm7ccAfiAXUL3ryQaqQ2nOHjMll4sAW1d9eP5iwkdIbv+U87oQp/ckYQcfXzglYPBiN69Ab9MrDAyim/aWQEnQHRA+5zruGEiXjuNlim+FOsQE7dCt9maPk1DLwjpo= 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 169746859154546.96419060366782; Mon, 16 Oct 2023 08:03:11 -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-584-a-LbbTJ8NyaqPeu_u_OQdg-1; Mon, 16 Oct 2023 11:03:00 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (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 5CA7E81DA0C; Mon, 16 Oct 2023 15:02:23 +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 49FE31C060AE; Mon, 16 Oct 2023 15:02:23 +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 3869A1946588; Mon, 16 Oct 2023 15:02:23 +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 1CDB51946597 for ; Mon, 16 Oct 2023 15:02:22 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 09DAD40C6F79; Mon, 16 Oct 2023 15:02:22 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5BD6F40C6CA0 for ; Mon, 16 Oct 2023 15:02:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697468590; 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=HIQSzfNRm5I1wh+2FLrIlKPIPs7kKgTeWJDxH/VBuQc=; b=duD5MdtWoQaTB3zRPNZYCAnniyF8krkgxtVmyeNlL7UviCEtRW7kOp+bB+Y1id1HutR3ah K62Bxnb+Y1dGNsu9X8GrmR9P7Mq2EIQip0JRwYpX9eZMUO4lCdjCz+DHC1aMflsPqStPwL vvCVx9aN6LoF8ZH9IwTJ3h8YaLWt5TY= X-MC-Unique: a-LbbTJ8NyaqPeu_u_OQdg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 22/31] qemu: domain: Use 'format' layer node name accessors for nodename setup code Date: Mon, 16 Oct 2023 17:01:49 +0200 Message-ID: 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.7 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: 1697468592406100016 Content-Type: text/plain; charset="utf-8" The code setting the nodenames needs to use the 'true' nodename of the format layer. Signed-off-by: Peter Krempa --- src/qemu/qemu_domain.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 1b2f09a316..d8d3a17e55 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2001,7 +2001,7 @@ qemuStorageSourcePrivateDataParse(xmlXPathContextPtr = ctxt, xmlNodePtr nbdkitnode =3D NULL; qemuBlockStorageSourceSetStorageNodename(src, virXPathString("string(.= /nodenames/nodename[@type=3D'storage']/@name)", ctxt)); - src->nodeformat =3D virXPathString("string(./nodenames/nodename[@type= =3D'format']/@name)", ctxt); + qemuBlockStorageSourceSetFormatNodename(src, virXPathString("string(./= nodenames/nodename[@type=3D'format']/@name)", ctxt)); src->tlsAlias =3D virXPathString("string(./objects/TLSx509/@alias)", c= txt); if (src->sliceStorage) @@ -2112,7 +2112,7 @@ qemuStorageSourcePrivateDataFormat(virStorageSource *= src, g_auto(virBuffer) fdsetsChildBuf =3D VIR_BUFFER_INIT_CHILD(buf); virBufferEscapeString(&nodenamesChildBuf, "\n", qemuBlockStorageSourceGetStorageNodename(src)); - virBufferEscapeString(&nodenamesChildBuf, "\n", src->nodeformat); + virBufferEscapeString(&nodenamesChildBuf, "\n", qemuBlockStorageSourceGetFormatNodename(src)); if (src->sliceStorage) virBufferEscapeString(&nodenamesChildBuf, "\n", @@ -2817,8 +2817,9 @@ qemuDomainVirStorageSourceFindByNodeName(virStorageSo= urce *top, for (tmp =3D top; virStorageSourceIsBacking(tmp); tmp =3D tmp->backing= Store) { const char *nodestorage =3D qemuBlockStorageSourceGetStorageNodena= me(tmp); + const char *nodeformat =3D qemuBlockStorageSourceGetFormatNodename= (tmp); - if ((tmp->nodeformat && STREQ(tmp->nodeformat, nodeName)) || + if ((nodeformat && STREQ(nodeformat, nodeName)) || (nodestorage && STREQ(nodestorage, nodeName))) return tmp; } @@ -11144,10 +11145,11 @@ qemuDomainPrepareStorageSourceBlockdevNodename(vi= rDomainDiskDef *disk, virQEMUDriverConfig *cfg) { char *nodestorage =3D g_strdup_printf("%s-storage", nodenameprefix); + char *nodeformat =3D g_strdup_printf("%s-format", nodenameprefix); /* qemuBlockStorageSourceSetStorageNodename steals 'nodestorage' */ qemuBlockStorageSourceSetStorageNodename(src, nodestorage); - src->nodeformat =3D g_strdup_printf("%s-format", nodenameprefix); + qemuBlockStorageSourceSetFormatNodename(src, nodeformat); if (qemuBlockStorageSourceNeedsStorageSliceLayer(src)) src->sliceStorage->nodename =3D g_strdup_printf("libvirt-%u-slice-= sto", src->id); @@ -11161,8 +11163,7 @@ qemuDomainPrepareStorageSourceBlockdevNodename(virD= omainDiskDef *disk, qemuDomainPrepareStorageSourceConfig(src, cfg); qemuDomainPrepareDiskSourceData(disk, src); - if (qemuDomainSecretStorageSourcePrepareEncryption(priv, src, - src->nodeformat) < = 0) + if (qemuDomainSecretStorageSourcePrepareEncryption(priv, src, nodeform= at) < 0) return -1; if (!qemuDomainPrepareStorageSourceNbdkit(src, cfg, nodestorage, priv)= ) { @@ -11698,7 +11699,7 @@ qemuDomainInitializePflashStorageSource(virDomainOb= j *vm, pflash0->path =3D g_strdup(def->os.loader->path); pflash0->readonly =3D false; virTristateBoolToBool(def->os.loader->readonly, &pflash0->readonly); - pflash0->nodeformat =3D g_strdup("libvirt-pflash0-format"); + qemuBlockStorageSourceSetFormatNodename(pflash0, g_strdup("libvirt-pfl= ash0-format")); qemuBlockStorageSourceSetStorageNodename(pflash0, g_strdup("libvirt-pf= lash0-storage")); if (def->os.loader->nvram) { --=20 2.41.0