shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-01-17 02:03:40 +03:00
Code Releases Wiki Activity

feature #348: Xen DISKs can now use a custom driver (tap:aio:, file:, ...)

Browse Source
This commit is contained in:
Ruben S. Montero 2010-10-29 18:50:57 +02:00
parent 827795d6fa
commit e3d82b69e9
2 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/vmm/XenDriver.cc
View File

@ -49,6 +49,8 @@ int XenDriver::deployment_description(
string target = "";
string ro = "";
string type = "";
string driver = "";
string default_driver = "";
string mode;
const VectorAttribute * nic;
@ -216,6 +218,13 @@ int XenDriver::deployment_description(
num = vm->get_template_attribute("DISK",attrs);
get_default("DISK","DRIVER",default_driver);
if (default_driver.empty())
{
default_driver = "tap:aio:";
}
file << "disk = [" << endl;
for (int i=0; i < num ;i++)
@ -230,6 +239,7 @@ int XenDriver::deployment_description(
target = disk->vector_value("TARGET");
type = disk->vector_value("TYPE");
ro = disk->vector_value("READONLY");
driver = disk->vector_value("DRIVER");
if ( target.empty() )
{
@ -253,13 +263,20 @@ int XenDriver::deployment_description(
}
}
if ( type == "BLOCK" )
if ( !driver.empty() )
{
file << " 'phy:";
file << " '" << driver;
}
else
{
file << " 'tap:aio:";
if ( type == "BLOCK" )
{
file << " 'phy:";
}
else
{
file << " '" << default_driver;
}
}
file << vm->get_remote_dir() << "/disk." << i << ","
@ -278,12 +295,22 @@ int XenDriver::deployment_description(
{
context = dynamic_cast<const VectorAttribute *>(attrs[0]);
target = context->vector_value("TARGET");
driver = context->vector_value("DRIVER");
if ( !target.empty() )
{
file << " "
<< "'tap:aio:" << vm->get_remote_dir() << "/disk." << num <<","
<< target << ","
file << " '";
if ( !driver.empty() )
{
file << driver;
}
else
{
file << default_driver;
}
file << vm->get_remote_dir() << "/disk." << num <<","<< target <<","
<< "r'," << endl;
}
else

3
src/vmm_mad/ssh/vmm_ssh_xen.conf
View File

@ -5,9 +5,10 @@
# - os [kernel,initrd,root,kernel_cmd]
# - memory
# - vcpu
# - disk[driver]
#VCPU = 1
#MEMORY = 128
#OS = [ kernel="/vmlinuz", initrd="/initrd.img", root="sda1", kernel_cmd="ro" ]
CREDIT = 256
DISK = [ driver = "tap:aio:" ]