Add QEMu as a target Hypervisor. It acts exactly the same as KVM, but

the libvirt plugin makes sure it runs through qemu rather than kvm. This
is useful for non-VT-capable hosts.

Author: sorenisanerd

VMBuilder/plugins/kvm/vm.py

@@ -18,9 +18,7 @@
 #
 from   VMBuilder import register_hypervisor, Hypervisor
 import VMBuilder
-import VMBuilder.hypervisor
 import os
-import os.path
 import stat
 
 class KVM(Hypervisor):
@@ -55,4 +53,15 @@ def deploy(self, destdir):
         os.chmod(script, stat.S_IRWXU | stat.S_IRWXU | stat.S_IROTH | stat.S_IXOTH)
         self.call_hooks('fix_ownership', script)
 
+    def libvirt_domain_type_name(self):
+        return 'kvm'
+
+class QEMu(KVM):
+    name = 'QEMu'
+    arg = 'qemu'
+
+    def libvirt_domain_type_name(self):
+        return 'qemu'
+
 register_hypervisor(KVM)
+register_hypervisor(QEMu)

VMBuilder/plugins/libvirt/__init__.py

@@ -37,8 +37,8 @@ def preflight_check(self):
         if not libvirt_uri:
             return True
 
-        if not self.context.name == 'KVM':
-            raise VMBuilderUserError('The libvirt plugin is only equiped to work with KVM at the moment.')
+        if not self.context.name == 'KVM' and not self.context.name == 'QEMu':
+            raise VMBuilderUserError('The libvirt plugin is only equiped to work with KVM and QEMu at the moment.')
 
         import libvirt
         import xml.etree.ElementTree
@@ -70,7 +70,8 @@ def deploy(self, destdir):
                       'virtio_net' : self.context.distro.use_virtio_net(),
                       'disks' : self.context.disks,
                       'filesystems' : self.context.filesystems,
-                      'hostname' : hostname }
+                      'hostname' : hostname,
+                      'domain_type' : self.context.libvirt_domain_type_name() }
         if self.context.preferred_storage == VMBuilder.hypervisor.STORAGE_FS_IMAGE:
             vmxml = VMBuilder.util.render_template('libvirt', self.context, 'libvirtxml_fsimage', tmpl_ctxt)
         else:

VMBuilder/plugins/libvirt/templates/libvirtxml.tmpl

@@ -1,4 +1,4 @@
-<domain type='kvm'>
+<domain type='$domain_type'>
   <name>$hostname</name>
   <memory>#echo int($mem) * 1024 #</memory>
   <vcpu>$cpus</vcpu>