[Pkg-libvirt-commits] [SCM] Libvirt debian packaging branch, master, updated. debian/0.4.6-6-11-g44cb9b5

[Guido Guenther]

The following commit has been merged in the master branch:
commit 9053fa148b838c68ef67b4cc376421e8fda8ef3b
Author: Guido Günther <agx at sigxcpu.org>
Date:   Thu Dec 4 16:29:58 2008 +0100

    raise error on invalid volume format
    
    instead of silently ignoring it

diff --git a/debian/patches/0010-raise-error-on-invalid-volume-format.patch b/debian/patches/0010-raise-error-on-invalid-volume-format.patch
new file mode 100644
index 0000000..53c541c
--- /dev/null
+++ b/debian/patches/0010-raise-error-on-invalid-volume-format.patch
@@ -0,0 +1,25 @@
+From ed71be2693133d640b4a99eb4b6f90c51bdffff8 Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
+Date: Thu, 4 Dec 2008 16:22:52 +0100
+Subject: [PATCH] raise error on invalid volume format
+
+---
+ src/storage_conf.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/src/storage_conf.c b/src/storage_conf.c
+index 29d74c8..f0d2b94 100644
+--- a/src/storage_conf.c
++++ b/src/storage_conf.c
+@@ -753,6 +753,8 @@ virStorageVolDefParseDoc(virConnectPtr conn,
+     if (options->formatFromString) {
+         char *format = virXPathString(conn, "string(/volume/target/format/@type)", ctxt);
+         if ((ret->target.format = (options->formatFromString)(conn, format)) < 0) {
++            virStorageReportError(conn, VIR_ERR_XML_ERROR,
++                                  _("unknown volume format type %s"), format);
+             VIR_FREE(format);
+             goto cleanup;
+         }
+-- 
+1.6.0.3
+
diff --git a/debian/patches/series b/debian/patches/series
index b856f4c..b8b43aa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@
 0007-also-look-for-usr-bin-kvm.patch
 0008-Increase-initial-qemu-monitor-read-timeout.patch
 0009-Open-qemu-monitor-log-O_APPEND-instead-of-O_TRUNC.patch
+0010-raise-error-on-invalid-volume-format.patch

-- 
Libvirt debian packaging