Fix use of --accelerate argument

Author: berrange

virt-install

@@ -230,7 +230,7 @@ def parse_args():
                       help=_("set up keymap for a graphical console"))
 
     parser.add_option("", "--accelerate", action="store_true", dest="accelerate",
-                      help=_("Use kernel acceleration capabilities"))
+                      help=_("Use kernel acceleration capabilities"), default=False)
     parser.add_option("", "--connect", type="string", dest="connect",
                       action="callback", callback=cli.check_before_store,
                       help=_("Connect to hypervisor with URI"),
@@ -351,10 +351,8 @@ def main():
 
     if options.fullvirt:
         os_type = "hvm"
-    elif options.paravirt:
-        os_type = "xen"
     else:
-        os_type = None
+        os_type = "xen"
 
     guest = capabilities.guestForOSType(type=os_type, arch=options.arch)
     if guest is None:
@@ -366,7 +364,7 @@ def main():
     else:
         hvm = False
 
-    domain = guest.bestDomainType()
+    domain = guest.bestDomainType(options.accelerate)
     type = domain.hypervisor_type
 
     if options.livecd:

virtinst/CapabilitiesParser.py

@@ -159,9 +159,23 @@ def parseXML(self, node):
             child = child.next
 
 
-    def bestDomainType(self):
-        # Picking last in list so we favour KVM/KQEMU over QEMU
-        return self.domains[-1]
+    def bestDomainType(self, accelerated=None):
+        if accelerated is None:
+            # Picking last in list so we favour KVM/KQEMU over QEMU
+            return self.domains[-1]
+        else:
+            priority = ["kvm", "xen", "kqemu", "qemu"]
+            if not accelerated:
+                priority.reverse()
+
+            for type in priority:
+                for d in self.domains:
+                    if d.hypervisor_type == type:
+                        return d
+
+            # Fallback, just return last item in list
+            return self.domains[-1]
+
 
 class Domain(object):
     def __init__(self, hypervisor_type, emulator = None, loader = None, machines = None, node = None):