Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: pu
Hi,
I'd like to update libvirt with wheezy's first point release since it
misses two important bug fixes. The first one addresses xen pv support
(#685749) while the other one adresses a leak (#705205).
Diff attached. O.k. to uplaod to wheezy-proposed-updates?
Cheers,
-- Guido
-- System Information:
Debian Release: jessie/sid
APT prefers stable
APT policy: (990, 'stable'), (500, 'testing'), (50, 'unstable'), (1,
'experimental')
Architecture: i386 (i686)
Kernel: Linux 3.2.0-4-686-pae (SMP w/2 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff --git a/debian/patches/debian/Allow-xen-toolstack-to-find-it-s-binaries.patch b/debian/patches/debian/Allow-xen-toolstack-to-find-it-s-binaries.patch
new file mode 100644
index 0000000..3ea255d
--- /dev/null
+++ b/debian/patches/debian/Allow-xen-toolstack-to-find-it-s-binaries.patch
@@ -0,0 +1,243 @@
+From: George Dunlap <george.dun...@eu.citrix.com>
+Date: Tue, 2 Oct 2012 19:19:04 +0200
+Subject: Allow xen toolstack to find it's binaries
+
+Closes: #685749
+---
+ docs/schemas/capability.rng | 4 ++--
+ src/xen/xen_hypervisor.c | 6 +++---
+ tests/xencapsdata/xen-i686-pae-hvm.xml | 6 +++---
+ tests/xencapsdata/xen-i686-pae.xml | 2 +-
+ tests/xencapsdata/xen-i686.xml | 2 +-
+ tests/xencapsdata/xen-ia64-be-hvm.xml | 6 +++---
+ tests/xencapsdata/xen-ia64-be.xml | 2 +-
+ tests/xencapsdata/xen-ia64-hvm.xml | 6 +++---
+ tests/xencapsdata/xen-ia64.xml | 2 +-
+ tests/xencapsdata/xen-ppc64.xml | 2 +-
+ tests/xencapsdata/xen-x86_64-hvm.xml | 10 +++++-----
+ tests/xencapsdata/xen-x86_64.xml | 2 +-
+ 12 files changed, 25 insertions(+), 25 deletions(-)
+
+diff --git a/docs/schemas/capability.rng b/docs/schemas/capability.rng
+index 8c928bc..b1930ba 100644
+--- a/docs/schemas/capability.rng
++++ b/docs/schemas/capability.rng
+@@ -241,13 +241,13 @@
+
+ <define name='emulator'>
+ <element name='emulator'>
+- <ref name='absFilePath'/>
++ <ref name='filePath'/>
+ </element>
+ </define>
+
+ <define name='loader'>
+ <element name='loader'>
+- <ref name='absFilePath'/>
++ <ref name='filePath'/>
+ </element>
+ </define>
+
+diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
+index 86f64f1..85ebcda 100644
+--- a/src/xen/xen_hypervisor.c
++++ b/src/xen/xen_hypervisor.c
+@@ -2347,10 +2347,10 @@ xenHypervisorBuildCapabilities(virConnectPtr conn,
+ guest_archs[i].model,
+ guest_archs[i].bits,
+ (STREQ(hostmachine, "x86_64") ?
+- "/usr/lib64/xen/bin/qemu-dm" :
+- "/usr/lib/xen/bin/qemu-dm"),
++ "qemu-dm" :
++ "qemu-dm"),
+ (guest_archs[i].hvm ?
+- "/usr/lib/xen-default/boot/hvmloader" :
++ "hvmloader" :
+ NULL),
+ 1,
+ machines)) == NULL) {
+diff --git a/tests/xencapsdata/xen-i686-pae-hvm.xml b/tests/xencapsdata/xen-i686-pae-hvm.xml
+index 7cde6df..cf1953d 100644
+--- a/tests/xencapsdata/xen-i686-pae-hvm.xml
++++ b/tests/xencapsdata/xen-i686-pae-hvm.xml
+@@ -20,7 +20,7 @@
+ <os_type>xen</os_type>
+ <arch name='i686'>
+ <wordsize>32</wordsize>
+- <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
++ <emulator>qemu-dm</emulator>
+ <machine>xenpv</machine>
+ <domain type='xen'>
+ </domain>
+@@ -34,8 +34,8 @@
+ <os_type>hvm</os_type>
+ <arch name='i686'>
+ <wordsize>32</wordsize>
+- <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
+- <loader>/usr/lib/xen-default/boot/hvmloader</loader>
++ <emulator>qemu-dm</emulator>
++ <loader>hvmloader</loader>
+ <machine>xenfv</machine>
+ <domain type='xen'>
+ </domain>
+diff --git a/tests/xencapsdata/xen-i686-pae.xml b/tests/xencapsdata/xen-i686-pae.xml
+index 3dba6eb..c774d6c 100644
+--- a/tests/xencapsdata/xen-i686-pae.xml
++++ b/tests/xencapsdata/xen-i686-pae.xml
+@@ -20,7 +20,7 @@
+ <os_type>xen</os_type>
+ <arch name='i686'>
+ <wordsize>32</wordsize>
+- <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
++ <emulator>qemu-dm</emulator>
+ <machine>xenpv</machine>
+ <domain type='xen'>
+ </domain>
+diff --git a/tests/xencapsdata/xen-i686.xml b/tests/xencapsdata/xen-i686.xml
+index 22d7685..bc36cbf 100644
+--- a/tests/xencapsdata/xen-i686.xml
++++ b/tests/xencapsdata/xen-i686.xml
+@@ -17,7 +17,7 @@
+ <os_type>xen</os_type>
+ <arch name='i686'>
+ <wordsize>32</wordsize>
+- <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
++ <emulator>qemu-dm</emulator>
+ <machine>xenpv</machine>
+ <domain type='xen'>
+ </domain>
+diff --git a/tests/xencapsdata/xen-ia64-be-hvm.xml b/tests/xencapsdata/xen-ia64-be-hvm.xml
+index e56e306..ddab377 100644
+--- a/tests/xencapsdata/xen-ia64-be-hvm.xml
++++ b/tests/xencapsdata/xen-ia64-be-hvm.xml
+@@ -17,7 +17,7 @@
+ <os_type>xen</os_type>
+ <arch name='ia64'>
+ <wordsize>64</wordsize>
+- <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
++ <emulator>qemu-dm</emulator>
+ <machine>xenpv</machine>
+ <domain type='xen'>
+ </domain>
+@@ -31,8 +31,8 @@
+ <os_type>hvm</os_type>
+ <arch name='ia64'>
+ <wordsize>64</wordsize>
+- <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
+- <loader>/usr/lib/xen-default/boot/hvmloader</loader>
++ <emulator>qemu-dm</emulator>
++ <loader>hvmloader</loader>
+ <machine>xenfv</machine>
+ <domain type='xen'>
+ </domain>
+diff --git a/tests/xencapsdata/xen-ia64-be.xml b/tests/xencapsdata/xen-ia64-be.xml
+index 017816c..4a548c6 100644
+--- a/tests/xencapsdata/xen-ia64-be.xml
++++ b/tests/xencapsdata/xen-ia64-be.xml
+@@ -17,7 +17,7 @@
+ <os_type>xen</os_type>
+ <arch name='ia64'>
+ <wordsize>64</wordsize>
+- <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
++ <emulator>qemu-dm</emulator>
+ <machine>xenpv</machine>
+ <domain type='xen'>
+ </domain>
+diff --git a/tests/xencapsdata/xen-ia64-hvm.xml b/tests/xencapsdata/xen-ia64-hvm.xml
+index 25617fc..32a0056 100644
+--- a/tests/xencapsdata/xen-ia64-hvm.xml
++++ b/tests/xencapsdata/xen-ia64-hvm.xml
+@@ -17,7 +17,7 @@
+ <os_type>xen</os_type>
+ <arch name='ia64'>
+ <wordsize>64</wordsize>
+- <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
++ <emulator>qemu-dm</emulator>
+ <machine>xenpv</machine>
+ <domain type='xen'>
+ </domain>
+@@ -28,8 +28,8 @@
+ <os_type>hvm</os_type>
+ <arch name='ia64'>
+ <wordsize>64</wordsize>
+- <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
+- <loader>/usr/lib/xen-default/boot/hvmloader</loader>
++ <emulator>qemu-dm</emulator>
++ <loader>hvmloader</loader>
+ <machine>xenfv</machine>
+ <domain type='xen'>
+ </domain>
+diff --git a/tests/xencapsdata/xen-ia64.xml b/tests/xencapsdata/xen-ia64.xml
+index 82ce965..e48b29b 100644
+--- a/tests/xencapsdata/xen-ia64.xml
++++ b/tests/xencapsdata/xen-ia64.xml
+@@ -17,7 +17,7 @@
+ <os_type>xen</os_type>
+ <arch name='ia64'>
+ <wordsize>64</wordsize>
+- <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
++ <emulator>qemu-dm</emulator>
+ <machine>xenpv</machine>
+ <domain type='xen'>
+ </domain>
+diff --git a/tests/xencapsdata/xen-ppc64.xml b/tests/xencapsdata/xen-ppc64.xml
+index 91401b9..2799fe8 100644
+--- a/tests/xencapsdata/xen-ppc64.xml
++++ b/tests/xencapsdata/xen-ppc64.xml
+@@ -17,7 +17,7 @@
+ <os_type>xen</os_type>
+ <arch name='ppc64'>
+ <wordsize>64</wordsize>
+- <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
++ <emulator>qemu-dm</emulator>
+ <machine>xenpv</machine>
+ <domain type='xen'>
+ </domain>
+diff --git a/tests/xencapsdata/xen-x86_64-hvm.xml b/tests/xencapsdata/xen-x86_64-hvm.xml
+index 493d1ea..9e79899 100644
+--- a/tests/xencapsdata/xen-x86_64-hvm.xml
++++ b/tests/xencapsdata/xen-x86_64-hvm.xml
+@@ -20,7 +20,7 @@
+ <os_type>xen</os_type>
+ <arch name='x86_64'>
+ <wordsize>64</wordsize>
+- <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
++ <emulator>qemu-dm</emulator>
+ <machine>xenpv</machine>
+ <domain type='xen'>
+ </domain>
+@@ -31,8 +31,8 @@
+ <os_type>hvm</os_type>
+ <arch name='i686'>
+ <wordsize>32</wordsize>
+- <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
+- <loader>/usr/lib/xen-default/boot/hvmloader</loader>
++ <emulator>qemu-dm</emulator>
++ <loader>hvmloader</loader>
+ <machine>xenfv</machine>
+ <domain type='xen'>
+ </domain>
+@@ -49,8 +49,8 @@
+ <os_type>hvm</os_type>
+ <arch name='x86_64'>
+ <wordsize>64</wordsize>
+- <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
+- <loader>/usr/lib/xen-default/boot/hvmloader</loader>
++ <emulator>qemu-dm</emulator>
++ <loader>hvmloader</loader>
+ <machine>xenfv</machine>
+ <domain type='xen'>
+ </domain>
+diff --git a/tests/xencapsdata/xen-x86_64.xml b/tests/xencapsdata/xen-x86_64.xml
+index 0c3279b..73e232e 100644
+--- a/tests/xencapsdata/xen-x86_64.xml
++++ b/tests/xencapsdata/xen-x86_64.xml
+@@ -20,7 +20,7 @@
+ <os_type>xen</os_type>
+ <arch name='x86_64'>
+ <wordsize>64</wordsize>
+- <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
++ <emulator>qemu-dm</emulator>
+ <machine>xenpv</machine>
+ <domain type='xen'>
+ </domain>
diff --git a/debian/patches/fix-leak-virStorageBackendLogicalMakeVol.patch b/debian/patches/fix-leak-virStorageBackendLogicalMakeVol.patch
new file mode 100644
index 0000000..013d931
--- /dev/null
+++ b/debian/patches/fix-leak-virStorageBackendLogicalMakeVol.patch
@@ -0,0 +1,31 @@
+From: Luca Tettamanti <ltettama...@acunu.com>
+Date: Thu, 25 Apr 2013 21:44:30 +0200
+Subject: Backport upstream 71da3b66 (fix leak in virStorageBackendLogicalMakeVol)
+
+===================================================================
+---
+ src/storage/storage_backend_logical.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c
+index 9a91dd9..7abb17b 100644
+--- a/src/storage/storage_backend_logical.c
++++ b/src/storage/storage_backend_logical.c
+@@ -204,13 +204,16 @@ virStorageBackendLogicalMakeVol(virStoragePoolObjPtr pool,
+ if (err != 0) {
+ char error[100];
+ regerror(err, reg, error, sizeof(error));
++ regfree(reg);
+ virStorageReportError(VIR_ERR_INTERNAL_ERROR,
+ _("Failed to compile regex %s"),
+ error);
+ goto cleanup;
+ }
+
+- if (regexec(reg, groups[3], nvars, vars, 0) != 0) {
++ err = regexec(reg, groups[3], nvars, vars, 0);
++ regfree(reg);
++ if (err != 0) {
+ virStorageReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+ _("malformed volume extent devices value"));
+ goto cleanup;
diff --git a/debian/patches/series b/debian/patches/series
index 25a27e3..5e1cbe7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -18,3 +18,5 @@ Revert-rpc-Discard-non-blocking-calls-only-when-nece.patch
qemu-Fix-off-by-one-error-while-unescaping-monitor-s.patch
rpc-Fix-crash-on-error-paths-of-message-dispatching.patch
qemu-Add-support-for-no-user-config.patch
+debian/Allow-xen-toolstack-to-find-it-s-binaries.patch
+fix-leak-virStorageBackendLogicalMakeVol.patch
