catdog2/vm-manager
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'master' of git.tuxzone.org:vm-manager

Browse Source 
Conflicts:
	VMHelper.py
This commit is contained in:
Peter Dahlberg
2013-12-15 19:03:26 +01:00
parent a6bbba40b1 fe76eda41b
commit 17ea144b62
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
manager.py
View File

@@ -39,19 +39,24 @@ def vmm_start(args):
print("VM {0} is already running!".format(args.vmid)) print("VM {0} is already running!".format(args.vmid))
return return
#TODO: pass ignore hibernation file flag
print('Starting VM {0.vmid}.'.format(args)) print('Starting VM {0.vmid}.'.format(args))
fullpath_manager = os.path.realpath(sys.argv[0]) fullpath_manager = os.path.realpath(sys.argv[0])
helper.startVM(args.vmid,fullpath_manager)
if (args.i is not None and args.i >= 1):
helper.startVM(args.vmid, fullpath_manager, True)
else:
helper.startVM(args.vmid, fullpath_manager)
#print("Successfully started: " + ("yes" if helper.process_running(args.vmid) else "no")) #print("Successfully started: " + ("yes" if helper.process_running(args.vmid) else "no"))
def vmm_shutdown(args): def vmm_shutdown(args):
print('Shutting down all VMs.')
timeout = SHUTDOWN_TIMEOUT if args.t is None or args.t < 0 else args.t timeout = SHUTDOWN_TIMEOUT if args.t is None or args.t < 0 else args.t
stCallback = lambda vmid, st : print("VM {0}: {1}".format(vmid, stopStatusToMessage[st])) stCallback = lambda vmid, st : print("VM {0}: {1}".format(vmid, stopStatusToMessage[st]))
helper.shutdownVMs(timeout, args.s is None or args.s < 1, statusCallback=stCallback) helper.shutdownVMs(timeout, args.s is None or args.s < 1, statusCallback=stCallback)
def vmm_hibernate(args): def vmm_hibernate(args):
print('Hibernating all VMs.')
#TODO: implement ;) #TODO: implement ;)
def vmm_stop(args): def vmm_stop(args):

2
qemu-wrapper.sh
View File

@@ -10,5 +10,5 @@ shift
vmid=$1 vmid=$1
shift shift
$QEMU $@ $QEMU "$@"
$python $manager cleanup $vmid $python $manager cleanup $vmid