[Pkg-libvirt-commits] [libvirt] 02/02: Don't validata filesystem target type.

Guido Guenther agx at moszumanska.debian.org
Wed Mar 25 14:31:41 UTC 2015


This is an automated email from the git hooks/post-receive script.

agx pushed a commit to branch master
in repository libvirt.

commit a8fee3f3e4e0d13ae4f84df7ba7e4ba46acfed89
Author: Guido Günther <agx at sigxcpu.org>
Date:   Wed Mar 25 15:29:20 2015 +0100

    Don't validata filesystem target type.
    
    Since 'virsh' validates XML this can lead to uneditable (but perfectly
    valid) configs.
---
 .../Don-t-validata-filesystem-target-type.patch    | 31 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 32 insertions(+)

diff --git a/debian/patches/Don-t-validata-filesystem-target-type.patch b/debian/patches/Don-t-validata-filesystem-target-type.patch
new file mode 100644
index 0000000..cf7390e
--- /dev/null
+++ b/debian/patches/Don-t-validata-filesystem-target-type.patch
@@ -0,0 +1,31 @@
+From: =?utf-8?q?Guido_G=C3=BCnther?= <agx at sigxcpu.org>
+Date: Sat, 21 Mar 2015 11:37:12 +0100
+Subject: Don't validata filesystem target type
+
+When using QEMU's 9pfs the target "dir" element is not necessarily an
+absolute path but merely an arbitrary identifier. So validation in that
+case currently fails with the misleading
+
+   $ virt-xml-validate /tmp/test.xml
+   Relax-NG validity error : Extra element devices in interleave
+   /tmp/test.xml:24: element devices: Relax-NG validity error : Element domain failed to validate content
+   /tmp/test.xml fails to validate
+---
+ docs/schemas/domaincommon.rng | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
+index 1a266e5..e1cea6b 100644
+--- a/docs/schemas/domaincommon.rng
++++ b/docs/schemas/domaincommon.rng
+@@ -1929,9 +1929,7 @@
+       </choice>
+       <interleave>
+         <element name="target">
+-          <attribute name="dir">
+-            <ref name="absDirPath"/>
+-          </attribute>
++          <attribute name="dir"/>
+           <empty/>
+         </element>
+         <optional>
diff --git a/debian/patches/series b/debian/patches/series
index fcb95a0..512f647 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -27,3 +27,4 @@ upstream/vbox-fix-a-bug-in-_machineStateInactive.patch
 security/CVE-2015-0236-qemu-Check-ACLs-when-dumping-security-.patch
 security/CVE-2015-0236-qemu-Check-ACLs-when-dumping-securi-14.patch
 qemu-Don-t-try-to-parse-help-for-new-QEM.patch
+Don-t-validata-filesystem-target-type.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libvirt.git



More information about the Pkg-libvirt-commits mailing list