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

F #5681: disk source element depends on disk type

Browse Source 
following the domain XML definition https://libvirt.org/formatdomain.html
```
_source_
  Representation of the _disk source_ depends on the _disk type_ attribute value as follows:
  _file_
    The _file_ attribute specifies the fully-qualified path to the file holding the disk. Since 0.0.3
  _block_
    The _dev_ attribute specifies the fully-qualified path to the host device to serve as the disk. Since 0.0.3
```

Also, I took the liberty to remove the _Image::FILE_ case form the switch as it is the default one.

(cherry picked from commit 83404b5ec29e537665c7c80950bd26ed1c240812)
This commit is contained in:
Anton Todorov 2022-12-13 10:38:15 +02:00 committed by Ruben S. Montero
parent 4a2f8193a8
commit c51c35f810
No known key found for this signature in database
GPG Key ID: A0CEA6FA880A1D87
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/vmm/LibVirtDriverKVM.cc
View File

@ -1522,6 +1522,7 @@ int LibVirtDriver::deployment_description_kvm(
Image::DiskType ctxt_disk_type = Image::FILE;
string s_cdt;
string s_cst;
if (auto ds = nd.get_dspool()->get_ro(vm->get_ds_id()))
{
@ -1530,21 +1531,20 @@ int LibVirtDriver::deployment_description_kvm(
switch (ctxt_disk_type)
{
case Image::FILE:
s_cdt = "file";
break;
case Image::BLOCK:
s_cdt = "block";
s_cst = "dev";
break;
default:
s_cdt = "file";
s_cst = "file";
break;
}
fname << vm->get_system_dir() << "/disk." << disk_id;
file << "\t\t<disk type='" << s_cdt << "' device='cdrom'>\n"
<< "\t\t\t<source file="
<< "\t\t\t<source " << s_cst << "="
<< one_util::escape_xml_attr(fname.str()) << "/>\n"
<< "\t\t\t<target dev=" << one_util::escape_xml_attr(target);