mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-04 22:40:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

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

See merge request !282
This commit is contained in:
Hans-Christoph Steiner 2017-06-07 18:19:40 +00:00
commit e36864e4f0
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
buildserver/Vagrantfile vendored
View file

@ -29,7 +29,7 @@ Vagrant.configure("2") do |config|
elsif configfile["vm_provider"] == "libvirt" elsif configfile["vm_provider"] == "libvirt"
# use KVM/QEMU if this is running in KVM/QEMU # use KVM/QEMU if this is running in KVM/QEMU
config.vm.provider :libvirt do |libvirt| config.vm.provider :libvirt do |libvirt|
libvirt.driver = "kvm" libvirt.driver = configfile["hwvirtex"] == "on" ? "kvm" : "qemu"
libvirt.host = "localhost" libvirt.host = "localhost"
libvirt.uri = "qemu:///system" libvirt.uri = "qemu:///system"
libvirt.cpus = configfile["cpus"] libvirt.cpus = configfile["cpus"]