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 #1233: Fix compilation. Detach operation broken

Browse Source
This commit is contained in:
Ruben S. Montero 2012-06-15 12:43:52 +02:00
parent bdba7a3d3c
commit 6e44c6ebf3
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/dm/DispatchManagerActions.cc
View File

@ -919,7 +919,7 @@ int DispatchManager::detach(
int disk_id,
string & error_str)
{
ostringstream oss;
/* ostringstream oss;
int rc;
int vid = vm->get_oid();
@ -942,8 +942,8 @@ int DispatchManager::detach(
goto error;
}
// TODO: Cancel resched?
// vm->set_resched(false);
TODO: Cancel resched?
vm->set_resched(false);
vm->set_state(VirtualMachine::HOTPLUG);
vmpool->update(vm);
@ -968,5 +968,5 @@ error_state:
vm->unlock();
return -2;
return -2;*/
}

12
src/vm/VirtualMachine.cc
View File

@ -1238,9 +1238,10 @@ VectorAttribute * VirtualMachine::set_up_attach_disk(
// TODO: this method requires the VM to be locked, and then it locks the Image
// to acquire. Check if this can be troublesome
/*
int VirtualMachine::detach_disk(int disk_id, string& error_str)
{
int num_disks;
vector<Attribute *> disks;
VectorAttribute * disk;
@ -1276,8 +1277,9 @@ int VirtualMachine::detach_disk(int disk_id, string& error_str)
}
return 0;
}
}
*/
/* -------------------------------------------------------------------------- */
/* -------------------------------------------------------------------------- */
@ -1368,7 +1370,8 @@ VectorAttribute * VirtualMachine::delete_attach_disk()
int VirtualMachine::detach_success()
{
return attach_failure();
return 0;
/*return attach_failure();*/
}
/* -------------------------------------------------------------------------- */
@ -1376,7 +1379,8 @@ int VirtualMachine::detach_success()
int VirtualMachine::detach_failure()
{
return attach_success();
return 0;
/*return attach_success();*/
}
/* -------------------------------------------------------------------------- */