From 17edfb56a5375b84b85cce929052dfd358c5c16d Mon Sep 17 00:00:00 2001 From: "Ruben S. Montero" Date: Sun, 8 May 2011 02:52:43 +0200 Subject: [PATCH] feature #553: Added cache attribute for DISK in the KVM driver --- src/vmm/LibVirtDriverKVM.cc | 35 +++++++++++++++++++++++++++----- src/vmm_mad/ssh/vmm_ssh_kvm.conf | 4 ++-- 2 files changed, 32 insertions(+), 7 deletions(-) diff --git a/src/vmm/LibVirtDriverKVM.cc b/src/vmm/LibVirtDriverKVM.cc index 5585127214..a3baa9d5bb 100644 --- a/src/vmm/LibVirtDriverKVM.cc +++ b/src/vmm/LibVirtDriverKVM.cc @@ -53,7 +53,9 @@ int LibVirtDriver::deployment_description_kvm( string bus = ""; string ro = ""; string driver = ""; - string default_driver = ""; + string cache = ""; + string default_driver = ""; + string default_driver_cache = ""; bool readonly; const VectorAttribute * nic; @@ -254,9 +256,8 @@ int LibVirtDriver::deployment_description_kvm( attrs.clear(); // ------------------------------------------------------------------------ - // Disks + // DEVICES SECTION // ------------------------------------------------------------------------ - file << "\t" << endl; if (emulator == "kvm") @@ -271,6 +272,9 @@ int LibVirtDriver::deployment_description_kvm( file << "\t\t" << emulator_path << "" << endl; } + // ------------------------------------------------------------------------ + // Disks + // ------------------------------------------------------------------------ get_default("DISK","DRIVER",default_driver); if (default_driver.empty()) @@ -278,6 +282,15 @@ int LibVirtDriver::deployment_description_kvm( default_driver = "raw"; } + get_default("DISK","CACHE",default_driver_cache); + + if (default_driver_cache.empty()) + { + default_driver_cache = "default"; + } + + // ------------------------------------------------------------------------ + num = vm->get_template_attribute("DISK",attrs); for (int i=0; i < num ;i++) @@ -294,6 +307,7 @@ int LibVirtDriver::deployment_description_kvm( ro = disk->vector_value("READONLY"); bus = disk->vector_value("BUS"); driver = disk->vector_value("DRIVER"); + cache = disk->vector_value("CACHE"); if (target.empty()) { @@ -366,11 +380,22 @@ int LibVirtDriver::deployment_description_kvm( if ( !driver.empty() ) { - file << driver << "'/>" << endl; + file << driver; } else { - file << default_driver << "'/>" << endl; + file << default_driver; + } + + file << "' cache='"; + + if ( !cache.empty() ) + { + file << cache << "'/>" << endl; + } + else + { + file << default_driver_cache << "'/>" << endl; } file << "\t\t" << endl; diff --git a/src/vmm_mad/ssh/vmm_ssh_kvm.conf b/src/vmm_mad/ssh/vmm_ssh_kvm.conf index 8dcdcd9a5d..72d862cf20 100644 --- a/src/vmm_mad/ssh/vmm_ssh_kvm.conf +++ b/src/vmm_mad/ssh/vmm_ssh_kvm.conf @@ -23,7 +23,7 @@ # - cpu # - vcpu # - features [acpi, pae] -# - disk [driver] +# - disk [driver, cache] # - nic [filter] #EMULATOR = /usr/libexec/qemu-kvm @@ -34,6 +34,6 @@ OS = [ boot = "hd", arch = "i686" ] FEATURES = [ PAE = "no", ACPI = "yes" ] -DISK = [ driver = "raw" ] +DISK = [ driver = "raw" , cache = "default"] NIC = [ filter = "clean-traffic" ]