From nobody Tue Sep  9 23:37:04 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=1748254469; cv=none;
	d=zohomail.com; s=zohoarc;
	b=ktsQpt/rN1rtM2MYT5U/4WyFlYogQ4ySLyQNHscEC9PiIez9Nj1WvdR9LHfaUw35b8+zE2A+0uEau6ayv8uBL96ofjUshw9eQWj9PIzaS6TmPzMJ0ErqrfZ1zu5R+ccVwQd9c8rDj8F34k4EniBk7KmW0I5Nlc2vSGK/f+SDHg0=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1748254469;
 h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id;
	bh=3Q0399tvrBVaUSLfzOpTL2nYq9RfJj/MSzmPlKiXcp0=;
	b=Xtw3jzZZYdXYX9HNnjS/UYc4PS7NGvlIpGwmvYx/qRfmx0M9rpAVFUyH9vWzvnpIy9/ysrjSCDZSpKEOsWNDO4Al10ry2jzv0AAuokFeJaZRSWf3zp0I9F+iTf9RBOKnC86r7MoBXBmTLkdIEFoBcQ7E7tP8YcoabiDi1wxcrt0=
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=<devel@lists.libvirt.org> (p=reject dis=none)
Return-Path: <devel-bounces@lists.libvirt.org>
Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by
 mx.zohomail.com
	with SMTPS id 174825446965892.21152385599748;
 Mon, 26 May 2025 03:14:29 -0700 (PDT)
Received: by lists.libvirt.org (Postfix, from userid 996)
	id A367B161C; Mon, 26 May 2025 06:14:28 -0400 (EDT)
Received: from lists.libvirt.org (localhost [IPv6:::1])
	by lists.libvirt.org (Postfix) with ESMTP id B9C4C168A;
	Mon, 26 May 2025 06:13:14 -0400 (EDT)
Received: by lists.libvirt.org (Postfix, from userid 996)
	id 1A5D417AC; Mon, 26 May 2025 06:13:09 -0400 (EDT)
Received: from us-smtp-delivery-124.mimecast.com
 (us-smtp-delivery-124.mimecast.com [170.10.129.124])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by lists.libvirt.org (Postfix) with ESMTPS id 3D9C513D8
	for <devel@lists.libvirt.org>; Mon, 26 May 2025 06:13:07 -0400 (EDT)
Received: from mx-prod-mc-08.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-317-Qd-g2sr7M0SF63qwrz-3Nw-1; Mon,
 26 May 2025 06:13:05 -0400
Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com
 (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4])
	(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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS
 id DCAF71800447
	for <devel@lists.libvirt.org>; Mon, 26 May 2025 10:13:04 +0000 (UTC)
Received: from kshcheti-thinkpadp1gen4i.tpbc.com (unknown [10.43.2.246])
	by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP
 id D3E2630001A1;
	Mon, 26 May 2025 10:13:03 +0000 (UTC)
X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org
X-Spam-Level: 
X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED,
	MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5,
	RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED,
	RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable
	autolearn_force=no version=3.4.4
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
	s=mimecast20190719; t=1748254387;
	h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
	 to:to:cc:cc:mime-version:mime-version:content-type:content-type:
	 content-transfer-encoding:content-transfer-encoding:
	 in-reply-to:in-reply-to:references:references;
	bh=I6XJqDmsrw8X6CzPFK5gcLqPiFDfmpHC42GG8qwnlzI=;
	b=ALSW1GT1fOXDiEQM9vGPk5c0OlObd61bl9JvHWA/O8d5BjZ1mGhaAEvNGBwkA9d/f6YmYo
	zXO0V1KGlqbsTX9Re+IpSWSFQE7w2nkrUSijT2ukBTQljd+iSDK1LvX3YuKWnGBX5OGZo9
	hZUNKWUE1gEGrRksnKhao3/bp4p5wno=
X-MC-Unique: Qd-g2sr7M0SF63qwrz-3Nw-1
X-Mimecast-MFC-AGG-ID: Qd-g2sr7M0SF63qwrz-3Nw_1748254385
To: devel@lists.libvirt.org
Subject: [PATCH 1/2] schemas: path types unification / refactor
Date: Mon, 26 May 2025 12:10:38 +0200
Message-ID: <20250526101235.33731-2-kshcheti@redhat.com>
In-Reply-To: <20250526101235.33731-1-kshcheti@redhat.com>
References: <20250526101235.33731-1-kshcheti@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4
X-Mimecast-Spam-Score: 0
X-Mimecast-MFC-PROC-ID: z0l7R9ypT873T1hSdh9F3hLAv3nwwcw5PdnWF1IPoXA_1748254385
X-Mimecast-Originator: redhat.com
Content-Transfer-Encoding: quoted-printable
Message-ID-Hash: YP2LLPCNI35PAIGJSHIHP42UWNL45WFM
X-Message-ID-Hash: YP2LLPCNI35PAIGJSHIHP42UWNL45WFM
X-MailFrom: kshcheti@redhat.com
X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency;
 loop; banned-address; member-moderation; header-match-config-1;
 header-match-config-2; header-match-config-3;
 header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia;
 implicit-dest; max-recipients; max-size; news-moderation; no-subject;
 suspicious-header
CC: Kirill Shchetiniuk <kshcheti@redhat.com>
X-Mailman-Version: 3.2.2
Precedence: list
List-Id: Development discussions about the libvirt library & tools
 <devel.lists.libvirt.org>
Archived-At: 
 <https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/message/YP2LLPCNI35PAIGJSHIHP42UWNL45WFM/>
List-Archive: 
 <https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/>
List-Help: <mailto:devel-request@lists.libvirt.org?subject=help>
List-Post: <mailto:devel@lists.libvirt.org>
List-Subscribe: <mailto:devel-join@lists.libvirt.org>
List-Unsubscribe: <mailto:devel-leave@lists.libvirt.org>
From: Kirill Shchetiniuk via Devel <devel@lists.libvirt.org>
Reply-To: Kirill Shchetiniuk <kshcheti@redhat.com>
X-ZohoMail-DKIM: fail (Header signature does not verify)
X-ZM-MESSAGEID: 1748254472020116600
Content-Type: text/plain; charset="utf-8"; x-default="true"

From: Kirill Shchetiniuk <kshcheti@redhat.com>

Previously, path types were defined separately for files and
directories. The `absDirPath` type, in particular, did not accept
Windows-style paths. Now, absolute paths for files and directories are
united under the 'absolutePath' type.

Relative paths were in fact the same but under different names, and in
some places the 'filePath` was used for the directories. Now, the
relative path type definition is united under the 'relativePath' type.

Now only one place is explicitly meant to accept relative paths.

<define name=3D"sourceinfonetrelativepath">
  <element name=3D"dir">
    <attribute name=3D"path">
      <ref name=3D"relativePath"/>
    </attribute>
    <empty/>
  </element>
</define>

In other places, it is possible to use absolute paths, but the
`relativePath` type was retained for users who previously relied on
relative paths, to avoid breaking their existing setups. Thus,
relative paths can still be accepted.

Signed-off-by: Kirill Shchetiniuk <kshcheti@redhat.com>
---
 src/conf/schemas/basictypes.rng       |  18 +---
 src/conf/schemas/capability.rng       |   4 +-
 src/conf/schemas/domainbackup.rng     |  10 +--
 src/conf/schemas/domaincaps.rng       |   2 +-
 src/conf/schemas/domaincheckpoint.rng |   2 +-
 src/conf/schemas/domaincommon.rng     | 124 +++++++++++++-------------
 src/conf/schemas/domainsnapshot.rng   |   8 +-
 src/conf/schemas/network.rng          |   2 +-
 src/conf/schemas/secret.rng           |   2 +-
 src/conf/schemas/storagecommon.rng    |   2 +-
 src/conf/schemas/storagepool.rng      |  10 +--
 src/conf/schemas/storagevol.rng       |   6 +-
 12 files changed, 89 insertions(+), 101 deletions(-)

diff --git a/src/conf/schemas/basictypes.rng b/src/conf/schemas/basictypes.=
rng
index 2931e316b7..f0f4086ace 100644
--- a/src/conf/schemas/basictypes.rng
+++ b/src/conf/schemas/basictypes.rng
@@ -305,36 +305,24 @@
     </data>
   </define>
=20
-  <define name=3D"filePath">
+  <define name=3D"absolutePath">
     <data type=3D"string">
-      <param name=3D"pattern">.+</param>
+      <param name=3D"pattern">(/|[a-zA-Z]:\\).*</param>
     </data>
   </define>
=20
-  <define name=3D"dirPath">
+  <define name=3D"relativePath">
     <data type=3D"string">
       <param name=3D"pattern">.+</param>
     </data>
   </define>
=20
-  <define name=3D"absFilePath">
-    <data type=3D"string">
-      <param name=3D"pattern">(/|[a-zA-Z]:\\).+</param>
-    </data>
-  </define>
-
   <define name=3D"vmwarePath">
     <data type=3D"string">
       <param name=3D"pattern">\[[^\]]+\] .+</param>
     </data>
   </define>
=20
-  <define name=3D"absDirPath">
-    <data type=3D"string">
-      <param name=3D"pattern">/.*</param>
-    </data>
-  </define>
-
   <define name=3D"unit">
     <data type=3D"string">
       <param name=3D"pattern">([bB]([yY][tT][eE][sS]?)?)|([kKmMgGtTpPeE]([=
iI]?[bB])?)</param>
diff --git a/src/conf/schemas/capability.rng b/src/conf/schemas/capability.=
rng
index a1606941e7..4fc8fd82b7 100644
--- a/src/conf/schemas/capability.rng
+++ b/src/conf/schemas/capability.rng
@@ -378,13 +378,13 @@
=20
   <define name=3D"emulator">
     <element name=3D"emulator">
-      <ref name=3D"absFilePath"/>
+      <ref name=3D"absolutePath"/>
     </element>
   </define>
=20
   <define name=3D"loader">
     <element name=3D"loader">
-      <ref name=3D"absFilePath"/>
+      <ref name=3D"absolutePath"/>
     </element>
   </define>
=20
diff --git a/src/conf/schemas/domainbackup.rng b/src/conf/schemas/domainbac=
kup.rng
index 91cf2a7bbd..9d6571f90f 100644
--- a/src/conf/schemas/domainbackup.rng
+++ b/src/conf/schemas/domainbackup.rng
@@ -87,7 +87,7 @@
                       <value>unix</value>
                     </attribute>
                     <attribute name=3D"socket">
-                      <ref name=3D"absFilePath"/>
+                      <ref name=3D"absolutePath"/>
                     </attribute>
                   </group>
                   <group>
@@ -185,7 +185,7 @@
                   <optional>
                     <element name=3D"target">
                       <attribute name=3D"file">
-                        <ref name=3D"absFilePath"/>
+                        <ref name=3D"absolutePath"/>
                       </attribute>
                       <interleave>
                         <zeroOrMore>
@@ -209,7 +209,7 @@
                   <optional>
                     <element name=3D"target">
                       <attribute name=3D"dev">
-                        <ref name=3D"absFilePath"/>
+                        <ref name=3D"absolutePath"/>
                       </attribute>
                       <interleave>
                         <zeroOrMore>
@@ -267,7 +267,7 @@
                   <interleave>
                     <element name=3D"scratch">
                       <attribute name=3D"file">
-                        <ref name=3D"absFilePath"/>
+                        <ref name=3D"absolutePath"/>
                       </attribute>
                       <interleave>
                         <zeroOrMore>
@@ -290,7 +290,7 @@
                 <interleave>
                   <element name=3D"scratch">
                     <attribute name=3D"dev">
-                      <ref name=3D"absFilePath"/>
+                      <ref name=3D"absolutePath"/>
                     </attribute>
                     <interleave>
                       <zeroOrMore>
diff --git a/src/conf/schemas/domaincaps.rng b/src/conf/schemas/domaincaps.=
rng
index 595dbcd634..3afc282a2f 100644
--- a/src/conf/schemas/domaincaps.rng
+++ b/src/conf/schemas/domaincaps.rng
@@ -13,7 +13,7 @@
       <interleave>
         <optional>
           <element name=3D"path">
-            <ref name=3D"absFilePath"/>
+            <ref name=3D"absolutePath"/>
           </element>
         </optional>
         <element name=3D"domain">
diff --git a/src/conf/schemas/domaincheckpoint.rng b/src/conf/schemas/domai=
ncheckpoint.rng
index 72c4186235..188954d19a 100644
--- a/src/conf/schemas/domaincheckpoint.rng
+++ b/src/conf/schemas/domaincheckpoint.rng
@@ -56,7 +56,7 @@
       <attribute name=3D"name">
         <choice>
           <ref name=3D"diskTargetDev"/>
-          <ref name=3D"absFilePath"/>
+          <ref name=3D"absolutePath"/>
         </choice>
       </attribute>
       <choice>
diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincom=
mon.rng
index 5597d5a66b..c333e3e1e2 100644
--- a/src/conf/schemas/domaincommon.rng
+++ b/src/conf/schemas/domaincommon.rng
@@ -359,7 +359,7 @@
                 <ref name=3D"pflashFormat"/>
               </optional>
               <optional>
-                <ref name=3D"absFilePath"/>
+                <ref name=3D"absolutePath"/>
               </optional>
             </element>
           </optional>
@@ -367,7 +367,7 @@
             <element name=3D"nvram">
               <optional>
                 <attribute name=3D"template">
-                  <ref name=3D"absFilePath"/>
+                  <ref name=3D"absolutePath"/>
                 </attribute>
                 <optional>
                   <attribute name=3D"templateFormat">
@@ -381,7 +381,7 @@
               <optional>
                 <choice>
                   <group>
-                    <ref name=3D"absFilePath"/>
+                    <ref name=3D"absolutePath"/>
                   </group>
                   <group>
                     <ref name=3D"diskSource"/>
@@ -480,7 +480,7 @@
         </element>
         <optional>
           <element name=3D"init">
-            <ref name=3D"absFilePath"/>
+            <ref name=3D"absolutePath"/>
           </element>
         </optional>
         <zeroOrMore>
@@ -500,7 +500,7 @@
         </zeroOrMore>
         <optional>
           <element name=3D"initdir">
-            <ref name=3D"absFilePath"/>
+            <ref name=3D"absolutePath"/>
           </element>
         </optional>
         <optional>
@@ -995,7 +995,7 @@
           <element name=3D"device">
             <interleave>
               <element name=3D"path">
-                <ref name=3D"absFilePath"/>
+                <ref name=3D"absolutePath"/>
               </element>
               <optional>
                 <element name=3D"weight">
@@ -1322,7 +1322,7 @@
     <element name=3D"resource">
       <optional>
         <element name=3D"partition">
-          <ref name=3D"absFilePath"/>
+          <ref name=3D"absolutePath"/>
         </element>
       </optional>
       <optional>
@@ -1535,17 +1535,17 @@
     <interleave>
       <optional>
         <element name=3D"kernel">
-          <ref name=3D"absFilePath"/>
+          <ref name=3D"absolutePath"/>
         </element>
       </optional>
       <optional>
         <element name=3D"initrd">
-          <ref name=3D"absFilePath"/>
+          <ref name=3D"absolutePath"/>
         </element>
       </optional>
       <optional>
         <element name=3D"root">
-          <ref name=3D"absFilePath"/>
+          <ref name=3D"absolutePath"/>
         </element>
       </optional>
       <optional>
@@ -1560,7 +1560,7 @@
       </optional>
       <optional>
         <element name=3D"dtb">
-          <ref name=3D"absFilePath"/>
+          <ref name=3D"absolutePath"/>
         </element>
       </optional>
     </interleave>
@@ -1892,7 +1892,7 @@
           <optional>
             <attribute name=3D"file">
               <choice>
-                <ref name=3D"absFilePath"/>
+                <ref name=3D"absolutePath"/>
                 <ref name=3D"vmwarePath"/>
               </choice>
             </attribute>
@@ -1925,7 +1925,7 @@
           <optional>
             <attribute name=3D"dev">
               <choice>
-                <ref name=3D"absFilePath"/>
+                <ref name=3D"absolutePath"/>
                 <ref name=3D"deviceName"/>
               </choice>
             </attribute>
@@ -1956,7 +1956,7 @@
       <element name=3D"source">
         <interleave>
           <attribute name=3D"dir">
-            <ref name=3D"absFilePath"/>
+            <ref name=3D"absolutePath"/>
           </attribute>
           <ref name=3D"diskSourceCommon"/>
           <optional>
@@ -2000,7 +2000,7 @@
             <value>unix</value>
           </attribute>
           <attribute name=3D"socket">
-            <ref name=3D"absFilePath"/>
+            <ref name=3D"absolutePath"/>
           </attribute>
         </group>
       </choice>
@@ -2048,7 +2048,7 @@
         <optional>
           <element name=3D"config">
             <attribute name=3D"file">
-              <ref name=3D"absFilePath"/>
+              <ref name=3D"absolutePath"/>
             </attribute>
             <empty/>
           </element>
@@ -2243,7 +2243,7 @@
   <define name=3D"diskSourceNetworkProtocolSSHHostVerify">
     <element name=3D"knownHosts">
       <attribute name=3D"path">
-        <ref name=3D"absFilePath"/>
+        <ref name=3D"absolutePath"/>
       </attribute>
     </element>
   </define>
@@ -2256,10 +2256,10 @@
         </attribute>
         <choice>
           <attribute name=3D"keyfile">
-            <ref name=3D"absFilePath"/>
+            <ref name=3D"absolutePath"/>
           </attribute>
           <attribute name=3D"agentsock">
-            <ref name=3D"absFilePath"/>
+            <ref name=3D"absolutePath"/>
           </attribute>
         </choice>
       </interleave>
@@ -2495,7 +2495,7 @@
         <value>unix</value>
       </attribute>
       <attribute name=3D"path">
-        <ref name=3D"absFilePath"/>
+        <ref name=3D"absolutePath"/>
       </attribute>
       <optional>
          <ref name=3D"reconnect"/>
@@ -2510,7 +2510,7 @@
     </attribute>
     <element name=3D"source">
       <attribute name=3D"dev">
-        <ref name=3D"absFilePath"/>
+        <ref name=3D"absolutePath"/>
       </attribute>
       <empty/>
     </element>
@@ -3165,7 +3165,7 @@
             </optional>
             <element name=3D"source">
               <attribute name=3D"file">
-                <ref name=3D"absFilePath"/>
+                <ref name=3D"absolutePath"/>
               </attribute>
               <empty/>
             </element>
@@ -3182,7 +3182,7 @@
             </optional>
             <element name=3D"source">
               <attribute name=3D"dev">
-                <ref name=3D"absFilePath"/>
+                <ref name=3D"absolutePath"/>
               </attribute>
               <empty/>
             </element>
@@ -3207,12 +3207,12 @@
               <choice>
                 <group>
                   <attribute name=3D"dir">
-                    <ref name=3D"absDirPath"/>
+                    <ref name=3D"absolutePath"/>
                   </attribute>
                 </group>
                 <group>
                   <attribute name=3D"socket">
-                    <ref name=3D"absFilePath"/>
+                    <ref name=3D"absolutePath"/>
                   </attribute>
                 </group>
               </choice>
@@ -3236,7 +3236,7 @@
             </optional>
             <element name=3D"source">
               <attribute name=3D"dir">
-                <ref name=3D"absDirPath"/>
+                <ref name=3D"absolutePath"/>
               </attribute>
               <empty/>
             </element>
@@ -3341,7 +3341,7 @@
     <element name=3D"binary">
       <optional>
         <attribute name=3D"path">
-          <ref name=3D"absFilePath"/>
+          <ref name=3D"absolutePath"/>
         </attribute>
       </optional>
       <optional>
@@ -3495,7 +3495,7 @@
                 </optional>
                 <optional>
                   <attribute name=3D"path">
-                    <ref name=3D"absFilePath"/>
+                    <ref name=3D"absolutePath"/>
                   </attribute>
                 </optional>
                 <optional>
@@ -3857,7 +3857,7 @@
       <optional>
         <element name=3D"script">
           <attribute name=3D"path">
-            <ref name=3D"filePath"/>
+            <ref name=3D"relativePath"/>
           </attribute>
           <empty/>
         </element>
@@ -3865,7 +3865,7 @@
       <optional>
         <element name=3D"downscript">
           <attribute name=3D"path">
-            <ref name=3D"filePath"/>
+            <ref name=3D"relativePath"/>
           </attribute>
           <empty/>
         </element>
@@ -3900,17 +3900,17 @@
           </optional>
           <optional>
             <attribute name=3D"tap">
-              <ref name=3D"absFilePath"/>
+              <ref name=3D"absolutePath"/>
             </attribute>
           </optional>
           <optional>
             <attribute name=3D"vhost">
-              <ref name=3D"absFilePath"/>
+              <ref name=3D"absolutePath"/>
             </attribute>
           </optional>
           <optional>
             <attribute name=3D"logFile">
-              <ref name=3D"absFilePath"/>
+              <ref name=3D"absolutePath"/>
             </attribute>
           </optional>
         </element>
@@ -4195,7 +4195,7 @@
     -->
   <define name=3D"emulator">
     <element name=3D"emulator">
-      <ref name=3D"absFilePath"/>
+      <ref name=3D"absolutePath"/>
     </element>
   </define>
   <!--
@@ -4276,7 +4276,7 @@
             <group>
               <optional>
                 <attribute name=3D"socket">
-                  <ref name=3D"absFilePath"/>
+                  <ref name=3D"absolutePath"/>
                 </attribute>
               </optional>
             </group>
@@ -4475,7 +4475,7 @@
                 </attribute>
                 <optional>
                   <attribute name=3D"rendernode">
-                    <ref name=3D"absFilePath"/>
+                    <ref name=3D"absolutePath"/>
                   </attribute>
                 </optional>
                 <empty/>
@@ -4509,7 +4509,7 @@
                 </attribute>
                 <optional>
                   <attribute name=3D"rendernode">
-                    <ref name=3D"absFilePath"/>
+                    <ref name=3D"absolutePath"/>
                   </attribute>
                 </optional>
               </element>
@@ -4587,7 +4587,7 @@
             <element name=3D"gl">
               <optional>
                 <attribute name=3D"rendernode">
-                  <ref name=3D"absFilePath"/>
+                  <ref name=3D"absolutePath"/>
                 </attribute>
               </optional>
             </element>
@@ -4649,7 +4649,7 @@
             </attribute>
             <optional>
               <attribute name=3D"socket">
-                <ref name=3D"absFilePath"/>
+                <ref name=3D"absolutePath"/>
               </attribute>
             </optional>
           </group>
@@ -4766,7 +4766,7 @@
                 </optional>
                 <optional>
                   <attribute name=3D"rendernode">
-                    <ref name=3D"absFilePath"/>
+                    <ref name=3D"absolutePath"/>
                   </attribute>
                 </optional>
               </element>
@@ -4918,7 +4918,7 @@
     <ref name=3D"qemucdevSrcType"/>
     <optional>
       <attribute name=3D"tty">
-        <ref name=3D"absFilePath"/>
+        <ref name=3D"absolutePath"/>
       </attribute>
     </optional>
     <interleave>
@@ -5140,7 +5140,7 @@
       <optional>
         <element name=3D"log">
           <attribute name=3D"file">
-            <ref name=3D"absFilePath"/>
+            <ref name=3D"absolutePath"/>
           </attribute>
           <optional>
             <attribute name=3D"append">
@@ -5161,7 +5161,7 @@
         <group>
           <optional>
             <attribute name=3D"tty">
-              <ref name=3D"absFilePath"/>
+              <ref name=3D"absolutePath"/>
             </attribute>
           </optional>
           <empty/>
@@ -5297,7 +5297,7 @@
     <ref name=3D"audiocommonattr"/>
     <optional>
       <attribute name=3D"dev">
-        <ref name=3D"filePath"/>
+        <ref name=3D"relativePath"/>
       </attribute>
     </optional>
     <ref name=3D"audiocommonchild"/>
@@ -5570,7 +5570,7 @@
             </optional>
             <optional>
               <attribute name=3D"runtimeDir">
-                <ref name=3D"filePath"/>
+                <ref name=3D"relativePath"/>
               </attribute>
             </optional>
           </interleave>
@@ -5647,7 +5647,7 @@
           </attribute>
           <optional>
             <attribute name=3D"path">
-              <ref name=3D"filePath"/>
+              <ref name=3D"relativePath"/>
             </attribute>
           </optional>
           <interleave>
@@ -5746,7 +5746,7 @@
           <element name=3D"server">
             <optional>
               <attribute name=3D"path">
-                <ref name=3D"absFilePath"/>
+                <ref name=3D"absolutePath"/>
               </attribute>
             </optional>
           </element>
@@ -5911,7 +5911,7 @@
               </group>
               <optional>
                 <element name=3D"database">
-                  <ref name=3D"absDirPath"/>
+                  <ref name=3D"absolutePath"/>
                 </element>
               </optional>
             </interleave>
@@ -6022,7 +6022,7 @@
       <element name=3D"device">
         <optional>
           <attribute name=3D"path">
-            <ref name=3D"filePath"/>
+            <ref name=3D"absolutePath"/>
           </attribute>
         </optional>
       </element>
@@ -6036,7 +6036,7 @@
           <value>unix</value>
         </attribute>
         <attribute name=3D"path">
-          <ref name=3D"filePath"/>
+          <ref name=3D"relativePath"/>
         </attribute>
         <attribute name=3D"mode">
           <value>connect</value>
@@ -6054,7 +6054,7 @@
               <value>file</value>
             </attribute>
             <attribute name=3D"path">
-              <ref name=3D"absFilePath"/>
+              <ref name=3D"absolutePath"/>
             </attribute>
           </group>
           <group>
@@ -6062,7 +6062,7 @@
               <value>dir</value>
             </attribute>
             <attribute name=3D"path">
-              <ref name=3D"absDirPath"/>
+              <ref name=3D"absolutePath"/>
             </attribute>
           </group>
         </choice>
@@ -6277,7 +6277,7 @@
             </attribute>
             <element name=3D"source">
               <attribute name=3D"evdev">
-                <ref name=3D"absFilePath"/>
+                <ref name=3D"absolutePath"/>
               </attribute>
             </element>
           </group>
@@ -6287,7 +6287,7 @@
             </attribute>
             <element name=3D"source">
               <attribute name=3D"dev">
-                <ref name=3D"absFilePath"/>
+                <ref name=3D"absolutePath"/>
               </attribute>
               <optional>
                 <attribute name=3D"grab">
@@ -6388,7 +6388,7 @@
       <interleave>
         <optional>
           <element name=3D"path">
-            <ref name=3D"absFilePath"/>
+            <ref name=3D"absolutePath"/>
           </element>
         </optional>
         <element name=3D"size">
@@ -6662,7 +6662,7 @@
     </attribute>
     <element name=3D"source">
       <element name=3D"block">
-        <ref name=3D"absFilePath"/>
+        <ref name=3D"absolutePath"/>
       </element>
     </element>
   </define>
@@ -6673,7 +6673,7 @@
     </attribute>
     <element name=3D"source">
       <element name=3D"char">
-        <ref name=3D"absFilePath"/>
+        <ref name=3D"absolutePath"/>
       </element>
     </element>
   </define>
@@ -7245,7 +7245,7 @@
               <value>msdm</value>
             </choice>
           </attribute>
-          <ref name=3D"absFilePath"/>
+          <ref name=3D"absolutePath"/>
         </element>
       </zeroOrMore>
     </element>
@@ -7477,7 +7477,7 @@
       </optional>
       <optional>
         <attribute name=3D"file">
-          <ref name=3D"absFilePath"/>
+          <ref name=3D"absolutePath"/>
         </attribute>
       </optional>
       <empty/>
@@ -7561,7 +7561,7 @@
         <group>
           <interleave>
             <element name=3D"path">
-              <ref name=3D"absFilePath"/>
+              <ref name=3D"absolutePath"/>
             </element>
             <optional>
               <element name=3D"alignsize">
@@ -7673,7 +7673,7 @@
             <value>random</value>
           </attribute>
           <choice>
-            <ref name=3D"absFilePath"/>
+            <ref name=3D"absolutePath"/>
             <empty/>
           </choice>
         </group>
@@ -7819,7 +7819,7 @@
         <choice>
           <group> <!-- old format, for block copy back-compat -->
             <attribute name=3D"file">
-              <ref name=3D"absFilePath"/>
+              <ref name=3D"absolutePath"/>
             </attribute>
             <optional>
               <attribute name=3D"format">
diff --git a/src/conf/schemas/domainsnapshot.rng b/src/conf/schemas/domains=
napshot.rng
index 2549c47b22..6fbf66da5c 100644
--- a/src/conf/schemas/domainsnapshot.rng
+++ b/src/conf/schemas/domainsnapshot.rng
@@ -46,7 +46,7 @@
                   </attribute>
                 </optional>
                 <attribute name=3D"file">
-                  <ref name=3D"absFilePath"/>
+                  <ref name=3D"absolutePath"/>
                 </attribute>
               </group>
             </choice>
@@ -143,7 +143,7 @@
       <attribute name=3D"name">
         <choice>
           <ref name=3D"diskTargetDev"/>
-          <ref name=3D"absFilePath"/>
+          <ref name=3D"absolutePath"/>
         </choice>
       </attribute>
       <choice>
@@ -171,7 +171,7 @@
                   <element name=3D"source">
                     <optional>
                       <attribute name=3D"file">
-                        <ref name=3D"absFilePath"/>
+                        <ref name=3D"absolutePath"/>
                       </attribute>
                     </optional>
                     <optional>
@@ -201,7 +201,7 @@
                 <optional>
                   <element name=3D"source">
                     <attribute name=3D"dev">
-                      <ref name=3D"absFilePath"/>
+                      <ref name=3D"absolutePath"/>
                     </attribute>
                     <zeroOrMore>
                       <ref name=3D"devSeclabel"/>
diff --git a/src/conf/schemas/network.rng b/src/conf/schemas/network.rng
index b7c8551fad..bc170a59b5 100644
--- a/src/conf/schemas/network.rng
+++ b/src/conf/schemas/network.rng
@@ -422,7 +422,7 @@
                     </zeroOrMore>
                     <optional>
                       <element name=3D"bootp">
-                        <attribute name=3D"file"><ref name=3D"filePath"/><=
/attribute>
+                        <attribute name=3D"file"><ref name=3D"relativePath=
"/></attribute>
                         <optional>
                           <attribute name=3D"server"><ref name=3D"dnsName"=
/></attribute>
                         </optional>
diff --git a/src/conf/schemas/secret.rng b/src/conf/schemas/secret.rng
index c90e2eb81f..66a66e1c7b 100644
--- a/src/conf/schemas/secret.rng
+++ b/src/conf/schemas/secret.rng
@@ -51,7 +51,7 @@
       <value>volume</value>
     </attribute>
     <element name=3D"volume">
-      <ref name=3D"absFilePath"/>
+      <ref name=3D"absolutePath"/>
     </element>
   </define>
=20
diff --git a/src/conf/schemas/storagecommon.rng b/src/conf/schemas/storagec=
ommon.rng
index 14704c737e..04a913a776 100644
--- a/src/conf/schemas/storagecommon.rng
+++ b/src/conf/schemas/storagecommon.rng
@@ -82,7 +82,7 @@
         <value>unix</value>
       </attribute>
       <attribute name=3D"path">
-        <ref name=3D"absFilePath"/>
+        <ref name=3D"absolutePath"/>
       </attribute>
       <attribute name=3D"mode">
         <choice>
diff --git a/src/conf/schemas/storagepool.rng b/src/conf/schemas/storagepoo=
l.rng
index 63a8b75fd8..ec25ac7c25 100644
--- a/src/conf/schemas/storagepool.rng
+++ b/src/conf/schemas/storagepool.rng
@@ -311,7 +311,7 @@
     <element name=3D"target">
       <interleave>
         <element name=3D"path">
-          <ref name=3D"absFilePath"/>
+          <ref name=3D"absolutePath"/>
         </element>
         <ref name=3D"permissions"/>
       </interleave>
@@ -323,7 +323,7 @@
       <interleave>
         <optional>
           <element name=3D"path">
-            <ref name=3D"absFilePath"/>
+            <ref name=3D"absolutePath"/>
           </element>
         </optional>
         <ref name=3D"permissions"/>
@@ -354,7 +354,7 @@
     <element name=3D"device">
       <attribute name=3D"path">
         <choice>
-          <ref name=3D"absFilePath"/>
+          <ref name=3D"absolutePath"/>
           <ref name=3D"genericName"/>
           <ref name=3D"IscsiQualifiedName"/>
         </choice>
@@ -395,7 +395,7 @@
   <define name=3D"sourceinfodir">
     <element name=3D"dir">
       <attribute name=3D"path">
-        <ref name=3D"absDirPath"/>
+        <ref name=3D"absolutePath"/>
       </attribute>
       <empty/>
     </element>
@@ -404,7 +404,7 @@
   <define name=3D"sourceinfonetrelativepath">
     <element name=3D"dir">
       <attribute name=3D"path">
-        <ref name=3D"dirPath"/>
+        <ref name=3D"relativePath"/>
       </attribute>
       <empty/>
     </element>
diff --git a/src/conf/schemas/storagevol.rng b/src/conf/schemas/storagevol.=
rng
index 3e0f482007..a372c7ab78 100644
--- a/src/conf/schemas/storagevol.rng
+++ b/src/conf/schemas/storagevol.rng
@@ -106,7 +106,7 @@
           <element name=3D"path">
             <choice>
               <data type=3D"anyURI"/>
-              <ref name=3D"absFilePath"/>
+              <ref name=3D"absolutePath"/>
             </choice>
           </element>
         </optional>
@@ -138,7 +138,7 @@
     <element name=3D"backingStore">
       <interleave>
         <element name=3D"path">
-          <ref name=3D"absFilePath"/>
+          <ref name=3D"absolutePath"/>
         </element>
         <ref name=3D"format"/>
         <ref name=3D"permissions"/>
@@ -159,7 +159,7 @@
   <define name=3D"sourcedev">
     <element name=3D"device">
       <attribute name=3D"path">
-        <ref name=3D"absFilePath"/>
+        <ref name=3D"absolutePath"/>
       </attribute>
       <choice>
         <empty/>
--=20
2.49.0