From: Stefan Bader <stefan.bader@canonical.com>
Date: Wed, 24 Sep 2014 18:05:19 +0200
Subject: uvt-kvm: Fix iso image type for ds image

Newer versions of libfirt seem to make a difference now between raw
disk images and iso images and return "iso" for the latter.
The qemu driver does not allow that type, so convert it back to "raw"
for now.

Signed-off-by: Stefan Bader <stefan.bader@canonical.com>

---
Index: uvtool-0~bzr92/uvtool/libvirt/kvm.py
===================================================================
--- uvtool-0~bzr92.orig/uvtool/libvirt/kvm.py	2014-04-01 14:06:54.000000000 +0200
+++ uvtool-0~bzr92/uvtool/libvirt/kvm.py	2014-09-24 18:04:44.564097055 +0200
@@ -284,6 +284,15 @@ def compose_domain_xml(name, volumes, cp
             find('format').
             get('type')
             )
+
+        #
+        # Starting with the libvirt version in 14.10 the format type is
+        # "iso" for CDROM images, but the qemu driver only understands
+        # "raw".
+        #
+        if disk_format_type == "iso":
+            disk_format_type = "raw"
+
         if unsafe_caching:
             disk_driver = E.driver(
                 name='qemu', type=disk_format_type, cache='unsafe')