[Pkg-libvirt-maintainers] Bug#841291: Bug#841291: libvirt-bin: qemu backport v2.6 needs a backported version of libvirt-bin in Jessie

[Peter Schaefer]

On Tue, 29 Nov 2016 18:18:18 +0100 Guido =?iso-8859-1?Q?G=FCnther?= <agx at sigxcpu.org> wrote:
> On Tue, Nov 29, 2016 at 10:17:07AM +0200, Mathieu Tarral wrote:
> >
> > Would you like to update libvirt to v1.3.1 then ?
> 
> We nned a proper backport, I've looked at this already a while back but
> will need time to finish it.

Much of the patch of the afm. commit is just test code which does not get used when building
the debian package. The patch against the relevant C-file can be rebased to apply to libvirt-1.2.9
as in jessie-proper; see below. That fixes the issue for me.

Regards,
 Peter

--- a/src/qemu/qemu_command.c	2017-01-06 23:04:47.562699747 +0100
+++ b/src/qemu/qemu_command.c	2017-01-06 23:13:08.320993263 +0100
@@ -467,6 +37,12 @@
         }

         virBufferEscape(&opt, ',', ",", "%s,", source);
+
+        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));
     }
     VIR_FREE(source);

@@ -3527,11 +3533,6 @@
                        _("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 &&