From 00dd618c16bb115d638268d6a7e30c9228fa388b Mon Sep 17 00:00:00 2001
From: Javi Fontan <jfontan@opennebula.org>
Date: Tue, 19 Feb 2013 17:36:50 +0100
Subject: [PATCH 1/3] feature #1701: add io parameter to disks in kvm driver

---
 src/vmm/LibVirtDriverKVM.cc | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/vmm/LibVirtDriverKVM.cc b/src/vmm/LibVirtDriverKVM.cc
index 56872d9bdb..759fccaf8c 100644
--- a/src/vmm/LibVirtDriverKVM.cc
+++ b/src/vmm/LibVirtDriverKVM.cc
@@ -56,12 +56,14 @@ int LibVirtDriver::deployment_description_kvm(
     string  ro         = "";
     string  driver     = "";
     string  cache      = "";
+    string  disk_io    = "";
     string  source     = "";
     string  clone      = "";
 
     int     disk_id;
-    string  default_driver       = "";
-    string  default_driver_cache = "";
+    string  default_driver          = "";
+    string  default_driver_cache    = "";
+    string  default_driver_disk_io  = "";
     bool    readonly;
 
     const VectorAttribute * nic;
@@ -298,6 +300,7 @@ int LibVirtDriver::deployment_description_kvm(
        default_driver_cache = "default";
     }
 
+    get_default("DISK","IO",default_driver_disk_io);
     // ------------------------------------------------------------------------
 
     num = vm->get_template_attribute("DISK",attrs);
@@ -316,6 +319,7 @@ int LibVirtDriver::deployment_description_kvm(
         ro     = disk->vector_value("READONLY");
         driver = disk->vector_value("DRIVER");
         cache  = disk->vector_value("CACHE");
+        disk_io= disk->vector_value("IO");
         source = disk->vector_value("SOURCE");
         clone  = disk->vector_value("CLONE");
 
@@ -406,14 +410,23 @@ int LibVirtDriver::deployment_description_kvm(
 
         if ( !cache.empty() )
         {
-            file << cache << "'/>" << endl;
+            file << cache << "'";
         }
         else
         {
-            file << default_driver_cache << "'/>" << endl;
+            file << default_driver_cache << "'";
         }
 
-        file << "\t\t</disk>" << endl;
+        if ( !disk_io.empty() )
+        {
+            file << " io='" << disk_io << "'";
+        }
+        else if ( !default_driver_disk_io.empty() )
+        {
+            file << " io='" << default_driver_disk_io << "'";
+        }
+
+        file << "/>" << endl << "\t\t</disk>" << endl;
     }
 
     attrs.clear();

From 1a61c079e2ed4cab3b13a52f251d5e08b130924d Mon Sep 17 00:00:00 2001
From: Javi Fontan <jfontan@opennebula.org>
Date: Tue, 19 Feb 2013 18:56:27 +0100
Subject: [PATCH 2/3] feature #1701: add new disk io paramaeter to
 configuration file help

---
 src/vmm_mad/exec/vmm_exec_kvm.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vmm_mad/exec/vmm_exec_kvm.conf b/src/vmm_mad/exec/vmm_exec_kvm.conf
index 13e882b4c7..8002360a79 100644
--- a/src/vmm_mad/exec/vmm_exec_kvm.conf
+++ b/src/vmm_mad/exec/vmm_exec_kvm.conf
@@ -21,7 +21,7 @@
 #  - os [kernel,initrd,boot,root,kernel_cmd,arch]
 #  - vcpu
 #  - features [acpi, pae]
-#  - disk [driver, cache]
+#  - disk [driver, cache, io]
 #  - nic  [filter, model]
 #  - raw
 

From 4f5771920996170b3b2aa2360ca33122574665ff Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rsmontero@opennebula.org>
Date: Wed, 20 Feb 2013 10:36:28 +0100
Subject: [PATCH 3/3] feature #1701: Default cache mode set to none

---
 src/vmm_mad/exec/vmm_exec_kvm.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vmm_mad/exec/vmm_exec_kvm.conf b/src/vmm_mad/exec/vmm_exec_kvm.conf
index 8002360a79..5d26a3442d 100644
--- a/src/vmm_mad/exec/vmm_exec_kvm.conf
+++ b/src/vmm_mad/exec/vmm_exec_kvm.conf
@@ -32,7 +32,7 @@
 OS       = [ boot = "hd", arch = "i686" ]
 FEATURES = [ PAE = "no", ACPI = "yes" ]
 
-DISK     = [ driver = "raw" , cache = "default"]
+DISK     = [ driver = "raw" , cache = "none"]
 
 #NIC     = [ filter = "clean-traffic", model="virtio" ]
 #RAW     = "<devices><serial type=\"pty\"><source path=\"/dev/pts/5\"/><target port=\"0\"/></serial><console type=\"pty\" tty=\"/dev/pts/5\"><source path=\"/dev/pts/5\"/><target port=\"0\"/></console></devices>"