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

feature #1112: Drivers use new location paths

Browse Source
This commit is contained in:
Ruben S. Montero 2012-02-25 03:19:13 +01:00
parent 6999911f52
commit 51e1590cb4
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/vmm/LibVirtDriverKVM.cc
View File

@ -339,20 +339,20 @@ int LibVirtDriver::deployment_description_kvm(
if ( type == "BLOCK" )
{
file << "\t\t<disk type='block' device='disk'>" << endl
<< "\t\t\t<source dev='" << vm->get_remote_dir() << "/disk."
<< i << "'/>" << endl;
<< "\t\t\t<source dev='" << vm->get_remote_system_dir()
<< "/disk." << i << "'/>" << endl;
}
else if ( type == "CDROM" )
{
file << "\t\t<disk type='file' device='cdrom'>" << endl
<< "\t\t\t<source file='" << vm->get_remote_dir() << "/disk."
<< i << "'/>" << endl;
<< "\t\t\t<source file='" << vm->get_remote_system_dir()
<< "/disk." << i << "'/>" << endl;
}
else
{
file << "\t\t<disk type='file' device='disk'>" << endl
<< "\t\t\t<source file='" << vm->get_remote_dir() << "/disk."
<< i << "'/>" << endl;
<< "\t\t\t<source file='" << vm->get_remote_system_dir()
<< "/disk." << i << "'/>" << endl;
}
// ---- target device to map the disk ----
@ -419,8 +419,10 @@ int LibVirtDriver::deployment_description_kvm(
if ( !target.empty() )
{
file << "\t\t<disk type='file' device='cdrom'>" << endl;
file << "\t\t\t<source file='" << vm->get_remote_dir() << "/disk."
<< num << "'/>" << endl;
file << "\t\t\t<source file='" << vm->get_remote_system_dir()
<< "/disk." << num << "'/>" << endl;
file << "\t\t\t<target dev='" << target << "'/>" << endl;
file << "\t\t\t<readonly/>" << endl;

4
src/vmm/XenDriver.cc
View File

@ -281,7 +281,7 @@ int XenDriver::deployment_description(
}
}
file << vm->get_remote_dir() << "/disk." << i << ","
file << vm->get_remote_system_dir() << "/disk." << i << ","
<< target << ","
<< mode
<< "'," << endl;
@ -312,7 +312,7 @@ int XenDriver::deployment_description(
file << default_driver;
}
file << vm->get_remote_dir() << "/disk." << num <<","<< target <<","
file << vm->get_remote_system_dir() << "/disk." << num <<","<< target <<","
<< "r'," << endl;
}
else