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

feature #356: Disk format can be now specified for KVM using the driver attribute, also this is supported for CONTEXT

Browse Source 
(cherry picked from commit b6d4a7a925300be8a3387c5a112fec6600fb5a3a)
This commit is contained in:
Ruben S. Montero 2010-10-29 19:18:56 +02:00
parent 7bb96f8060
commit 47b0cf39af
2 changed files with 48 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/vmm/LibVirtDriverKVM.cc
View File

@ -49,6 +49,8 @@ int LibVirtDriver::deployment_description_kvm(
string target = "";
string bus = "";
string ro = "";
string driver = "";
string default_driver = "";
bool readonly;
const VectorAttribute * nic;
@ -245,6 +247,13 @@ int LibVirtDriver::deployment_description_kvm(
file << "\t\t<emulator>/usr/bin/kvm</emulator>" << endl;
}
get_default("DISK","DRIVER",default_driver);
if (default_driver.empty())
{
default_driver = "raw";
}
num = vm->get_template_attribute("DISK",attrs);
for (int i=0; i < num ;i++)
@ -260,6 +269,7 @@ int LibVirtDriver::deployment_description_kvm(
target = disk->vector_value("TARGET");
ro = disk->vector_value("READONLY");
bus = disk->vector_value("BUS");
driver = disk->vector_value("DRIVER");
if (target.empty())
{
@ -278,6 +288,8 @@ int LibVirtDriver::deployment_description_kvm(
}
}
// ---- Disk type and source for the image ----
if (type.empty() == false)
{
transform(type.begin(),type.end(),type.begin(),(int(*)(int))toupper);
@ -302,8 +314,12 @@ int LibVirtDriver::deployment_description_kvm(
<< i << "'/>" << endl;
}
// ---- target device to map the disk ----
file << "\t\t\t<target dev='" << target << "'";
// ---- bus ----
if (!bus.empty())
{
file << " bus='" << bus << "'/>" << endl;
@ -313,11 +329,26 @@ int LibVirtDriver::deployment_description_kvm(
file << "/>" << endl;
}
// ---- readonly attribute for the disk ----
if (readonly)
{
file << "\t\t\t<readonly/>" << endl;
}
// ---- Image Format using qemu driver ----
file << "\t\t\t<driver name='qemu' type='";
if ( !driver.empty() )
{
file << driver << "'/>" << endl;
}
else
{
file << default_driver << "'/>" << endl;
}
file << "\t\t</disk>" << endl;
}
@ -331,6 +362,7 @@ int LibVirtDriver::deployment_description_kvm(
{
context = dynamic_cast<const VectorAttribute *>(attrs[0]);
target = context->vector_value("TARGET");
driver = context->vector_value("DRIVER");
if ( !target.empty() )
{
@ -339,6 +371,18 @@ int LibVirtDriver::deployment_description_kvm(
<< num << "'/>" << endl;
file << "\t\t\t<target dev='" << target << "'/>" << endl;
file << "\t\t\t<readonly/>" << endl;
file << "\t\t\t<driver name='qemu' type='";
if ( !driver.empty() )
{
file << driver << "'/>" << endl;
}
else
{
file << default_driver << "'/>" << endl;
}
file << "\t\t</disk>" << endl;
}
else
@ -587,4 +631,3 @@ error_disk:
file.close();
return -1;
}

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

@ -6,13 +6,11 @@
# - cpu
# - vcpu
# - features [acpi, pae]
# - disk [driver ]
#VCPU = 1
#MEMORY = 128
#OS = [ kernel="/vmlinuz", initrd="/initrd.img", root="sda1", boot=hd,kernel_cmd="ro"]
OS = [ boot = "hd" ]
OS = [ boot = "hd" ]
FEATURES = [ PAE = "no", ACPI = "yes" ]
FEATURES = [
PAE=no,
ACPI=yes
]
DISK = [ driver = "raw" ]