shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-27 10:50:10 +03:00
Code Releases Wiki Activity

feature #553: Added cache attribute for DISK in the KVM driver

Browse Source
This commit is contained in:
Ruben S. Montero 2011-05-08 02:52:43 +02:00
parent dd32809e37
commit 17edfb56a5
2 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/vmm/LibVirtDriverKVM.cc
View File

@ -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<devices>" << endl;
if (emulator == "kvm")
@ -271,6 +272,9 @@ int LibVirtDriver::deployment_description_kvm(
file << "\t\t<emulator>" << emulator_path << "</emulator>" << 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</disk>" << endl;

4
src/vmm_mad/ssh/vmm_ssh_kvm.conf
View File

@ -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" ]