[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, master, updated. debian/0.8.0-2

[Guido Günther]

The following commit has been merged in the master branch:
commit d7d1abdc4ec1a30667be88f6ae4b0f2a8035b447
Author: Guido Günther <agx at sigxcpu.org>
Date:   Mon Apr 19 18:10:54 2010 +0200

    New patch 0008-Ignore-empty-type-statement-in-disk-element.patch
    
    Ignore empty type statement in disk element
    
    Closes: #578347

diff --git a/debian/patches/0008-Ignore-empty-type-statement-in-disk-element.patch b/debian/patches/0008-Ignore-empty-type-statement-in-disk-element.patch
new file mode 100644
index 0000000..85807c4
--- /dev/null
+++ b/debian/patches/0008-Ignore-empty-type-statement-in-disk-element.patch
@@ -0,0 +1,23 @@
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
+Date: Mon, 19 Apr 2010 18:08:19 +0200
+Subject: [PATCH] Ignore empty type statement in disk element
+
+Closes: #578347
+---
+ src/qemu/qemu_conf.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
+index 48252a5..6749b1d 100644
+--- a/src/qemu/qemu_conf.c
++++ b/src/qemu/qemu_conf.c
+@@ -2459,7 +2459,7 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk,
+     if (disk->readonly &&
+         qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE)
+         virBufferAddLit(&opt, ",readonly=on");
+-    if (disk->driverType &&
++    if (disk->driverType && strlen(disk->driverType) &&
+         disk->type != VIR_DOMAIN_DISK_TYPE_DIR &&
+         qemuCmdFlags & QEMUD_CMD_FLAG_DRIVE_FORMAT)
+         virBufferVSprintf(&opt, ",format=%s", disk->driverType);
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 5b4033f..779562e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,5 @@
 0004-fix-Debian-specific-path-to-hvm-loader.patch
 0005-Terminate-nc-on-EOF.patch
 0006-Don-t-drop-caps-when-exec-ing-qemu.patch
+0007-nwfilter-Don-t-crash-if-driverState-NULL.patch
+0008-Ignore-empty-type-statement-in-disk-element.patch

-- 
Libvirt Debian packaging