Fix os type for older libvirt Xen driver

Author: berrange

virtinst/DistroManager.py

@@ -220,10 +220,15 @@ def _get_osblob(self, install, hvm, arch = None, loader = None):
         if install or hvm:
             osblob = "<os>\n"
 
+            os_type = self.os_type
+            # Hack for older libvirt Xen driver
+            if os_type == "xen" and self.type == "xen":
+                os_type = "linux"
+
             if arch:
-                osblob += "    <type arch='%s'>%s</type>\n" % (arch, self.os_type)
+                osblob += "    <type arch='%s'>%s</type>\n" % (arch, os_type)
             else:
-                osblob += "    <type>%s</type>\n" % self.os_type
+                osblob += "    <type>%s</type>\n" % os_type
 
             if install and self.install["kernel"]:
                 osblob += "    <kernel>%s</kernel>\n"   % util.xml_escape(self.install["kernel"])
@@ -272,10 +277,15 @@ def _get_osblob(self, install, hvm, arch = None, loader = None):
         if install or hvm:
             osblob = "<os>\n"
 
+            os_type = self.os_type
+            # Hack for older libvirt Xen driver
+            if os_type == "xen" and self.type == "xen":
+                os_type = "linux"
+
             if arch:
-                osblob += "    <type arch='%s'>%s</type>\n" % (arch, self.os_type)
+                osblob += "    <type arch='%s'>%s</type>\n" % (arch, os_type)
             else:
-                osblob += "    <type>%s</type>\n" % self.os_type
+                osblob += "    <type>%s</type>\n" % os_type
 
             if loader:
                 osblob += "    <loader>%s</loader>\n" % loader

virtinst/ImageManager.py

@@ -109,14 +109,18 @@ def _get_osblob(self, install, hvm, arch = None, loader = None):
         osblob = "<os>\n"
 
         if hvm:
-            type = "hvm"
+            os_type = "hvm"
         else:
-            type = "linux"
+            # Hack for older libvirt Xen driver
+            if self.type == "xen":
+                os_type = "linux"
+            else:
+                os_type = "xen"
 
         if arch:
-            osblob += "    <type arch='%s'>%s</type>\n" % (arch, type)
+            osblob += "    <type arch='%s'>%s</type>\n" % (arch, os_type)
         else:
-            osblob += "    <type>%s</type>\n" % type
+            osblob += "    <type>%s</type>\n" % os_type
 
         if self.boot_caps.kernel:
             osblob += "    <kernel>%s</kernel>\n"   % util.xml_escape(self._abspath(self.boot_caps.kernel))

virtinst/LiveCDInstaller.py

@@ -58,8 +58,13 @@ def _get_osblob(self, install, hvm, arch = None, loader = None):
         if install:
             return None
 
+        os_type = self.os_type
+        # Hack for older libvirt Xen driver
+        if os_type == "xen" and self.type == "xen":
+            os_type = "linux"
+
         osblob  = "<os>\n"
-        osblob += "      <type>%s</type>\n" % self.os_type
+        osblob += "      <type>%s</type>\n" % os_type
         if loader:
             osblob += "      <loader>%s</loader>\n" % loader
         osblob += "      <boot dev='cdrom'/>\n"