From 5823b3a1c5d53a3b828aa14e3627bed8751d40b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Ole=C5=9B?= <lukaszoles@gmail.com>
Date: Wed, 16 Sep 2015 19:30:02 +0200
Subject: [PATCH 1/2] Speed improvements for libvirt

---
 Vagrantfile | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Vagrantfile b/Vagrantfile
index 650e3a44..b518e681 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -69,6 +69,9 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     config.vm.provider :libvirt do |libvirt|
       libvirt.driver = 'kvm'
       libvirt.memory = MASTER_RAM
+      libvirt.nested = true
+      libvirt.cpu_mode = 'host-passthrough'
+      libvirt.volume_cache = 'unsafe'
     end
 
     if SYNC_TYPE == 'nfs'
@@ -106,6 +109,9 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       config.vm.provider :libvirt do |libvirt|
         libvirt.driver = 'kvm'
         libvirt.memory = SLAVES_RAM
+        libvirt.nested = true
+        libvirt.cpu_mode = 'host-passthrough'
+        libvirt.volume_cache = 'unsafe'
       end
 
       if SYNC_TYPE == 'nfs'

From f2def8b81dc960f6eddd181469e779473a0a195e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Ole=C5=9B?= <lukaszoles@gmail.com>
Date: Thu, 17 Sep 2015 11:14:00 +0200
Subject: [PATCH 2/2] Add option set number of CPUs

---
 Vagrantfile                    | 14 ++++++++++++--
 vagrant-settings.yaml_defaults |  2 ++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index b518e681..d487e2ad 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -32,6 +32,8 @@ SLAVES_COUNT = cfg["slaves_count"]
 SLAVES_RAM = cfg["slaves_ram"]
 MASTER_RAM = cfg["master_ram"]
 SYNC_TYPE = cfg["sync_type"]
+MASTER_CPUS = cfg["master_cpus"]
+SLAVES_CPUS = cfg["slaves_cpus"]
 
 def ansible_playbook_command(filename, args=[])
   "ansible-playbook -v -i \"localhost,\" -c local /vagrant/bootstrap/playbooks/#{filename} #{args.join ' '}"
@@ -58,10 +60,14 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     config.vm.host_name = "solar-dev"
 
     config.vm.provider :virtualbox do |v|
+      v.memory = MASTER_RAM
+      v.cpus = MASTER_CPUS
       v.customize [
         "modifyvm", :id,
         "--memory", MASTER_RAM,
-        "--paravirtprovider", "kvm" # for linux guest
+        "--cpus", MASTER_CPUS,
+        "--paravirtprovider", "kvm", # for linux guest
+        "--ioapic", "on",
       ]
       v.name = "solar-dev"
     end
@@ -69,6 +75,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     config.vm.provider :libvirt do |libvirt|
       libvirt.driver = 'kvm'
       libvirt.memory = MASTER_RAM
+      libvirt.cpus = MASTER_CPUS
       libvirt.nested = true
       libvirt.cpu_mode = 'host-passthrough'
       libvirt.volume_cache = 'unsafe'
@@ -101,7 +108,9 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
         v.customize [
             "modifyvm", :id,
             "--memory", SLAVES_RAM,
-            "--paravirtprovider", "kvm" # for linux guest
+            "--cpus", SLAVES_CPUS,
+            "--paravirtprovider", "kvm", # for linux guest
+            "--ioapic", "on",
         ]
         v.name = "solar-dev#{index}"
       end
@@ -109,6 +118,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       config.vm.provider :libvirt do |libvirt|
         libvirt.driver = 'kvm'
         libvirt.memory = SLAVES_RAM
+        libvirt.cpus = SLAVES_CPUS
         libvirt.nested = true
         libvirt.cpu_mode = 'host-passthrough'
         libvirt.volume_cache = 'unsafe'
diff --git a/vagrant-settings.yaml_defaults b/vagrant-settings.yaml_defaults
index 19fbfe74..d672cb44 100644
--- a/vagrant-settings.yaml_defaults
+++ b/vagrant-settings.yaml_defaults
@@ -4,6 +4,8 @@
 slaves_count: 2
 slaves_ram: 1024
 master_ram: 1024
+master_cpus: 1
+slaves_cpus: 1
 # By default Virtualbox shared folder is used which is very slow
 # Uncomment following option to change it.
 # Possible options are: rsync, nfs