Package: release.debian.org
Severity: normal
Tags: jessie
User: release.debian....@packages.debian.org
Usertags: pu
Hi,
I'd like to update libvirt in jessie since the current one doesn't work
with recent QEMU 2.6 (as the one in backports). It needs a single patch
to to not generate QEMU invocationst that aren't understood by newer
QEMU.
While at that unbreak test-suite compilation.
O.k. to upload to p-u?
Cheers,
-- Guido
-- System Information:
Debian Release: 9.0
APT prefers testing
APT policy: (990, 'testing'), (500, 'unstable-debug'), (500,
'testing-debug'), (500, 'stable-updates'), (500, 'unstable'), (500, 'stable'),
(500, 'oldstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.9.0-2-amd64 (SMP w/4 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff --git a/debian/changelog b/debian/changelog
index 0c6761f61..021db6987 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+libvirt (1.2.9-9+deb8u4) jessie; urgency=medium
+
+ [ Guido Günther ]
+ * [7e378ce] Make sure the cgroup update notice is also shown in backports
+ * [bd11c4c] Unbreak compilation of qemuhelptest
+
+ [ Hilko Bengen ]
+ * [fffb132] Add patch to improve qemu v2.6+ compatibility (Closes: #841291)
+
+ -- Guido Günther <a...@sigxcpu.org> Fri, 17 Mar 2017 14:53:44 +0100
+
libvirt (1.2.9-9+deb8u3) jessie-security; urgency=high
* [9da83d8] CVE-2016-5008: qemu: Let empty default VNC password work as
diff --git a/debian/libvirt-daemon.NEWS b/debian/libvirt-daemon.NEWS
index 823e8aaec..59bdd40a5 100644
--- a/debian/libvirt-daemon.NEWS
+++ b/debian/libvirt-daemon.NEWS
@@ -1,4 +1,4 @@
-libvirt (1.1.4-2) unstable; urgency=low
+libvirt (1.1.4-2~) unstable; urgency=low
If you're using cgroups make sure you're using a different mount per cgroup
controller (cpu, memory, ...) that is mounted to /sys/fs/cgroup/<controller>.
diff --git a/debian/patches/series b/debian/patches/series
index b30557ba3..7d8ea4851 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -34,3 +34,4 @@ upstream/Report-original-error-when-QMP-probing-fails-with-ne.patch
security/CVE-2015-5313-storage-don-t-allow-in-filesystem-volu.patch
debian/Debianize-bridge-helper-path.patch
security/CVE-2016-5008-qemu-Let-empty-default-VNC-password-work-as.patch
+upstream/qemu-Specify-format-iff-disk-source-is-not-empty.patch
diff --git a/debian/patches/upstream/Report-original-error-when-QMP-probing-fails-with-ne.patch b/debian/patches/upstream/Report-original-error-when-QMP-probing-fails-with-ne.patch
index 1f6dab730..2adc0dbfa 100644
--- a/debian/patches/upstream/Report-original-error-when-QMP-probing-fails-with-ne.patch
+++ b/debian/patches/upstream/Report-original-error-when-QMP-probing-fails-with-ne.patch
@@ -176,7 +176,7 @@ index 975edf3..271fddc 100644
if (virQEMUCapsParseHelpStr("QEMU", help, flags,
- &version, &is_kvm, &kvm_version, false) == -1)
-+ &version, &is_kvm, &kvm_version, false, NULL) == -1) {
++ &version, &is_kvm, &kvm_version, false, NULL) == -1)
goto cleanup;
# ifndef WITH_YAJL
diff --git a/debian/patches/upstream/qemu-Specify-format-iff-disk-source-is-not-empty.patch b/debian/patches/upstream/qemu-Specify-format-iff-disk-source-is-not-empty.patch
new file mode 100644
index 000000000..5738fab50
--- /dev/null
+++ b/debian/patches/upstream/qemu-Specify-format-iff-disk-source-is-not-empty.patch
@@ -0,0 +1,52 @@
+From: Michal Privoznik <mpriv...@redhat.com>
+Date: Mon, 28 Dec 2015 15:13:52 +0100
+Subject: qemu: Specify format= iff disk source is not empty
+
+Just recently, qemu forbade specifying format for sourceless
+disks (qemu commit 39c4ae941ed992a3bb5). It kind of makes sense.
+If there's no file to open, why specify its format. Anyway, I
+have a domain like this:
+
+ <disk type='file' device='cdrom'>
+ <driver name='qemu' type='raw'/>
+ <target dev='hda' bus='ide'/>
+ <readonly/>
+ <address type='drive' controller='0' bus='0' target='0' unit='0'/>
+ </disk>
+
+and obviously I am unable to start it. Therefore, a fix on our
+side is needed too.
+
+Signed-off-by: Michal Privoznik <mpriv...@redhat.com>
+---
+ src/qemu/qemu_command.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
+index eb72451..755671d 100644
+--- a/src/qemu/qemu_command.c
++++ b/src/qemu/qemu_command.c
+@@ -3467,6 +3467,11 @@ qemuBuildDriveStr(virConnectPtr conn,
+ }
+
+ virBufferEscape(&opt, ',', ",", "%s,", source);
++
++ if (disk->src->format > 0 &&
++ disk->src->type != VIR_STORAGE_TYPE_DIR)
++ virBufferAsprintf(&opt, "format=%s,",
++ virStorageFileFormatTypeToString(disk->src->format));
+ }
+ VIR_FREE(source);
+
+@@ -3527,11 +3532,6 @@ qemuBuildDriveStr(virConnectPtr conn,
+ _("transient disks not supported yet"));
+ goto error;
+ }
+- if (disk->src->format > 0 &&
+- disk->src->type != VIR_STORAGE_TYPE_DIR &&
+- virQEMUCapsGet(qemuCaps, QEMU_CAPS_DRIVE_FORMAT))
+- virBufferAsprintf(&opt, ",format=%s",
+- virStorageFileFormatTypeToString(disk->src->format));
+
+ /* generate geometry command string */
+ if (disk->geometry.cylinders > 0 &&
