Always include loader tag for HVM guests

Author: berrange

virtinst/DistroManager.py

@@ -230,14 +230,14 @@ def _get_osblob(self, install, hvm, arch = None, loader = None):
             else:
                 osblob += "    <type>%s</type>\n" % os_type
 
+            if loader:
+                osblob += "    <loader>%s</loader>\n" % loader
+
             if install and self.install["kernel"]:
                 osblob += "    <kernel>%s</kernel>\n"   % util.xml_escape(self.install["kernel"])
                 osblob += "    <initrd>%s</initrd>\n"   % util.xml_escape(self.install["initrd"])
                 osblob += "    <cmdline>%s</cmdline>\n" % util.xml_escape(self.install["extraargs"])
             else:
-                if loader:
-                    osblob += "    <loader>%s</loader>\n" % loader
-
                 if install:
                     osblob += "    <boot dev='cdrom'/>\n"
                 else:

virtinst/ImageManager.py

@@ -122,14 +122,14 @@ def _get_osblob(self, install, hvm, arch = None, loader = None):
         else:
             osblob += "    <type>%s</type>\n" % os_type
 
+        if loader:
+            osblob += "    <loader>%s</loader>\n" % loader
         if self.boot_caps.kernel:
             osblob += "    <kernel>%s</kernel>\n"   % util.xml_escape(self._abspath(self.boot_caps.kernel))
             osblob += "    <initrd>%s</initrd>\n"   % util.xml_escape(self._abspath(self.boot_caps.initrd))
             osblob += "    <cmdline>%s</cmdline>\n" % util.xml_escape(self.boot_caps.cmdline)
             osblob += "  </os>"
         elif hvm:
-            if loader:
-                osblob += "    <loader>%s</loader>\n" % loader
             if self.boot_caps.bootdev:
                 osblob += "    <boot dev='%s'/>\n" % self.boot_caps.bootdev
             osblob += "  </os>"