svn commit: r772777 - /incubator/tashi/trunk/src/tashi/nodemanager/vmcontrol/qemu.py

[mr...@apache.org]

Author: mryan3
Date: Thu May  7 21:16:11 2009
New Revision: 772777

URL: http://svn.apache.org/viewvc?rev=772777&view=rev
Log:
Minor changes to the qemu backend: added the option to create a VM without ACPI and added the "list" arg that lists what vmmSpecificCalls are available


Modified:
    incubator/tashi/trunk/src/tashi/nodemanager/vmcontrol/qemu.py

Modified: incubator/tashi/trunk/src/tashi/nodemanager/vmcontrol/qemu.py
URL: http://svn.apache.org/viewvc/incubator/tashi/trunk/src/tashi/nodemanager/vmcontrol/qemu.py?rev=772777&r1=772776&r2=772777&view=diff
==============================================================================
--- incubator/tashi/trunk/src/tashi/nodemanager/vmcontrol/qemu.py (original)
+++ incubator/tashi/trunk/src/tashi/nodemanager/vmcontrol/qemu.py Thu May  7 21:16:11 2009
@@ -340,7 +340,11 @@
 			sourceString = ""
 		else:
 			sourceString = "-incoming %s" % (source)
-		cmd = "%s -clock %s %s %s -m %d -smp %d -serial none -vnc none -monitor pty %s" % (self.QEMU_BIN, clockString, diskString, nicString, instance.memory, instance.cores, sourceString)
+		if (boolean(instance.hints.get("noAcpi", False))):
+			noAcpiString = "-no-acpi"
+		else:
+			noAcpiString = ""
+		cmd = "%s %s -clock %s %s %s -m %d -smp %d -serial none -vnc none -monitor pty %s" % (self.QEMU_BIN, noAcpiString, clockString, diskString, nicString, instance.memory, instance.cores, sourceString)
 		log.info("QEMU command: %s" % (cmd))
 		cmd = cmd.split()
 		(pipe_r, pipe_w) = os.pipe()
@@ -566,6 +570,8 @@
 			self.consolePortLock.release()
 			threading.Thread(target=lambda: controlConsole(child,consolePort)).start()
 			return "Control console listenting on %s:%d" % (hostname, consolePort)
+		elif (arg == "list"):
+			return "startVnc\nstopVnc\nchangeCdrom:<image.iso>\nstartConsole"
 		else:
 			return "Unknown arg %s" % (arg)