[PATCH 5/7] schema: Remove workaround for bug in libxml2 2.7.6

Peter Krempa pkrempa at redhat.com
Wed Jan 6 16:57:59 UTC 2021


New libxml2 handles '\n' properly so the literal newline is not
necessary.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 docs/schemas/domaincommon.rng  | 8 ++------
 docs/schemas/storagecommon.rng | 4 +---
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index bcbaee9db8..39bed92115 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -19,9 +19,7 @@
   <define name="title">
     <element name="title">
       <data type="string">
-        <!-- Use literal newline instead of \n for bug in libxml2 2.7.6 -->
-        <param name="pattern">[^
-]+</param>
+        <param name="pattern">[^\n]+</param>
       </data>
     </element>
   </define>
@@ -6948,9 +6946,7 @@
   </define>
   <define name="domainName">
     <data type="string">
-      <!-- Use literal newline instead of \n for bug in libxml2 2.7.6 -->
-      <param name="pattern">[^
-]+</param>
+      <param name="pattern">[^\n]+</param>
     </data>
   </define>
   <define name="diskSerial">
diff --git a/docs/schemas/storagecommon.rng b/docs/schemas/storagecommon.rng
index 6597ebc824..54619d4cb0 100644
--- a/docs/schemas/storagecommon.rng
+++ b/docs/schemas/storagecommon.rng
@@ -8,9 +8,7 @@

   <define name="poolName">
     <data type="string">
-      <!-- Use literal newline instead of \n for bug in libxml2 2.7.6 -->
-      <param name="pattern">[^/
-]+</param>
+      <param name="pattern">[^/\n]+</param>
     </data>
   </define>

-- 
2.29.2




More information about the libvir-list mailing list