Merge branch 'check-vmx-libvirt' into 'master'

Use Qemu instead of KVM when we don't have VMX/SVM

See merge request !282

diff --git a/buildserver/Vagrantfile b/buildserver/Vagrantfile
index 15bcfca863a89d5eddaa45dfd7ef526234b85030..9abff4af383b92fa49e082bed668fb9c121a4b08 100644 (file)
--- a/buildserver/Vagrantfile
+++ b/buildserver/Vagrantfile
@@ -29,7 +29,7 @@ Vagrant.configure("2") do |config|
   elsif configfile["vm_provider"] == "libvirt"
     # use KVM/QEMU if this is running in KVM/QEMU
     config.vm.provider :libvirt do |libvirt|
-      libvirt.driver = "kvm"
+      libvirt.driver = configfile["hwvirtex"] == "on" ? "kvm" : "qemu"
       libvirt.host = "localhost"
       libvirt.uri = "qemu:///system"
       libvirt.cpus = configfile["cpus"]