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

B #3949: Fix error when attaching a disk to a VM using hybrid mode (#3955)

Browse Source
This commit is contained in:
Christian González 2019-11-19 12:39:20 +01:00 committed by Ruben S. Montero
parent 4dd2b9d0a2
commit 4abf3c88f4
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/vm/VirtualMachineDisk.cc
View File

@ -1111,6 +1111,15 @@ VirtualMachineDisk * VirtualMachineDisks::set_up_attach(int vmid, int uid,
VirtualMachineDisk * disk = new VirtualMachineDisk(vdisk, max_disk_id + 1);
if ( !tsys.empty() )
{
disk->replace("TM_MAD_SYSTEM", tsys);
}
else
{
disk->remove("TM_MAD_SYSTEM");
}
int rc = ipool->acquire_disk(vmid, disk, max_disk_id + 1, img_type,
dev_prefix, uid, image_id, &snap, true, error);
if ( rc != 0 )
@ -1175,15 +1184,6 @@ VirtualMachineDisk * VirtualMachineDisks::set_up_attach(int vmid, int uid,
disk->set_attach();
if ( !tsys.empty() )
{
disk->replace("TM_MAD_SYSTEM", tsys);
}
else
{
disk->remove("TM_MAD_SYSTEM");
}
add_attribute(disk, disk->get_disk_id());
return disk;