From nobody Tue Apr 30 01:48:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1548933359119765.8865779540156; Thu, 31 Jan 2019 03:15:59 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7D034A0498; Thu, 31 Jan 2019 11:15:56 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 47A015C21F; Thu, 31 Jan 2019 11:15:55 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 50BB01803391; Thu, 31 Jan 2019 11:15:52 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x0VBFpJm025359 for ; Thu, 31 Jan 2019 06:15:51 -0500 Received: by smtp.corp.redhat.com (Postfix) id 105DF104811B; Thu, 31 Jan 2019 11:15:51 +0000 (UTC) Received: from dhcp-16-175.lcy.redhat.com (unknown [10.42.16.175]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5CA2F1048105; Thu, 31 Jan 2019 11:15:50 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Thu, 31 Jan 2019 11:15:48 +0000 Message-Id: <20190131111548.9802-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH] storage: change custom namespace URIs to drop '/source' component X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Thu, 31 Jan 2019 11:15:57 +0000 (UTC) The custom namespaces were originally registered against the storage pool source struct, but during review this was changed to the top level storage pool struct. The namespace URIs were not updated to match, so had a redundant '/source' component. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: John Ferlan --- docs/formatstorage.html.in | 8 ++++---- docs/schemas/storagepool.rng | 4 ++-- src/storage/storage_backend_fs.c | 2 +- src/storage/storage_backend_rbd.c | 2 +- tests/storagepoolxml2xmlin/pool-netfs-ns-mountopts.xml | 2 +- tests/storagepoolxml2xmlin/pool-rbd-ns-configopts.xml | 2 +- tests/storagepoolxml2xmlout/pool-netfs-ns-mountopts.xml | 2 +- tests/storagepoolxml2xmlout/pool-rbd-ns-configopts.xml | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/formatstorage.html.in b/docs/formatstorage.html.in index d19bc579a4..6ebd23549f 100644 --- a/docs/formatstorage.html.in +++ b/docs/formatstorage.html.in @@ -535,7 +535,7 @@ provide the XML namespace attribute syntax as follows: =20

- xmlns:fs=3D'http://libvirt.org/schemas/storagepool/source/fs/1.0' + xmlns:fs=3D'http://libvirt.org/schemas/storagepool/fs/1.0'

=20

@@ -551,7 +551,7 @@ The following XML snippet shows the syntax required in order to utilize for a netfs pool: 

-<pool type=3D"netfs" xmlns:fs=3D'http://libvirt.org/schemas/storagepool=
/source/fs/1.0'>
+<pool type=3D"netfs" xmlns:fs=3D'http://libvirt.org/schemas/storagepool=
/fs/1.0'>
   <name>nfsimages</name>
 ...
   <source>
@@ -580,7 +580,7 @@
         syntax as follows:
=20
         

-        xmlns:rbd=3D'http://libvirt.org/schemas/storagepool/source/rbd/1.0'
+        xmlns:rbd=3D'http://libvirt.org/schemas/storagepool/rbd/1.0'
         

=20
         

@@ -598,7 +598,7 @@
         The following XML snippet shows the syntax required in order to
         utilize
       
-<pool type=3D"rbd" xmlns:rbd=3D'http://libvirt.org/schemas/storagepool/=
source/rbd/1.0'>
+<pool type=3D"rbd" xmlns:rbd=3D'http://libvirt.org/schemas/storagepool/=
rbd/1.0'>
   <name>myrbdpool</name>
 ...
   <source>
diff --git a/docs/schemas/storagepool.rng b/docs/schemas/storagepool.rng
index e1944ff8e1..3907f70afe 100644
--- a/docs/schemas/storagepool.rng
+++ b/docs/schemas/storagepool.rng
@@ -697,7 +697,7 @@
     -->
=20
   
-    
+    
       
         
           
@@ -714,7 +714,7 @@
     -->
=20
   
-    
+    
       
         
           
diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend=
_fs.c
index 0ec99c60ed..ddb422d874 100644
--- a/src/storage/storage_backend_fs.c
+++ b/src/storage/storage_backend_fs.c
@@ -562,7 +562,7 @@ virStorageBackendFileSystemBuild(virStoragePoolObjPtr p=
ool,
=20
 #if WITH_STORAGE_FS
=20
-# define STORAGE_POOL_FS_NAMESPACE_HREF "http://libvirt.org/schemas/storag=
epool/source/fs/1.0"
+# define STORAGE_POOL_FS_NAMESPACE_HREF "http://libvirt.org/schemas/storag=
epool/fs/1.0"
=20
 /* Backend XML Namespace handling for fs or netfs specific mount options to
  * be added to the mount -o {options_list} command line that are not other=
wise
diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backen=
d_rbd.c
index 2348f80146..cfbce1ad19 100644
--- a/src/storage/storage_backend_rbd.c
+++ b/src/storage/storage_backend_rbd.c
@@ -59,7 +59,7 @@ struct _virStoragePoolRBDConfigOptionsDef {
     char **values;
 };
=20
-#define STORAGE_POOL_RBD_NAMESPACE_HREF "http://libvirt.org/schemas/storag=
epool/source/rbd/1.0"
+#define STORAGE_POOL_RBD_NAMESPACE_HREF "http://libvirt.org/schemas/storag=
epool/rbd/1.0"
=20
 static void
 virStoragePoolDefRBDNamespaceFree(void *nsdata)
diff --git a/tests/storagepoolxml2xmlin/pool-netfs-ns-mountopts.xml b/tests=
/storagepoolxml2xmlin/pool-netfs-ns-mountopts.xml
index 0434b16eb7..c2777ed29d 100644
--- a/tests/storagepoolxml2xmlin/pool-netfs-ns-mountopts.xml
+++ b/tests/storagepoolxml2xmlin/pool-netfs-ns-mountopts.xml
@@ -1,4 +1,4 @@
-
+
   nfsimages
   7641d5a8-af11-f730-a34e-0a7dfcede71f
   0
diff --git a/tests/storagepoolxml2xmlin/pool-rbd-ns-configopts.xml b/tests/=
storagepoolxml2xmlin/pool-rbd-ns-configopts.xml
index 6b62aa6f7e..a924fc103d 100644
--- a/tests/storagepoolxml2xmlin/pool-rbd-ns-configopts.xml
+++ b/tests/storagepoolxml2xmlin/pool-rbd-ns-configopts.xml
@@ -1,4 +1,4 @@
-
+
   ceph
   47c1faee-0207-e741-f5ae-d9b019b98fe2
   
diff --git a/tests/storagepoolxml2xmlout/pool-netfs-ns-mountopts.xml b/test=
s/storagepoolxml2xmlout/pool-netfs-ns-mountopts.xml
index 4bd164f220..fdc332087f 100644
--- a/tests/storagepoolxml2xmlout/pool-netfs-ns-mountopts.xml
+++ b/tests/storagepoolxml2xmlout/pool-netfs-ns-mountopts.xml
@@ -1,4 +1,4 @@
-
+
   nfsimages
   7641d5a8-af11-f730-a34e-0a7dfcede71f
   0
diff --git a/tests/storagepoolxml2xmlout/pool-rbd-ns-configopts.xml b/tests=
/storagepoolxml2xmlout/pool-rbd-ns-configopts.xml
index 342a0ff74a..7fbcc3e0bc 100644
--- a/tests/storagepoolxml2xmlout/pool-rbd-ns-configopts.xml
+++ b/tests/storagepoolxml2xmlout/pool-rbd-ns-configopts.xml
@@ -1,4 +1,4 @@
-
+
   ceph
   47c1faee-0207-e741-f5ae-d9b019b98fe2
   0
--=20
2.20.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list