diff --git a/src/dm/DispatchManagerActions.cc b/src/dm/DispatchManagerActions.cc index 651afc07c9..627bf300d6 100644 --- a/src/dm/DispatchManagerActions.cc +++ b/src/dm/DispatchManagerActions.cc @@ -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;*/ } diff --git a/src/vm/VirtualMachine.cc b/src/vm/VirtualMachine.cc index 3b49ebd8f5..69bad3686b 100644 --- a/src/vm/VirtualMachine.cc +++ b/src/vm/VirtualMachine.cc @@ -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 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();*/ } /* -------------------------------------------------------------------------- */