Merge lp:~virtualbricks/virtualbrick/pre-devel-0.3 into lp:virtualbrick/0.x

[Daniele Lacamera]

Support for Qemu monitor. Added savevm/loadvm functions. Ready for final development of the blueprint live-management. After 0.2 release this is the focus of development.

[Francesco Apollonio (lorddex)]

review: Approve

[lp:~virtualbricks/virtualbrick/pre-devel-0.3]

42. By Daniele Lacamera on 2011-01-30

Added qcow2 to image creation

=== modified file 'virtualbricks.glade'
--- virtualbricks.glade	2011-01-29 19:10:34 +0000
+++ virtualbricks.glade	2011-01-30 10:15:09 +0000
@@ -2171,7 +2171,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <widget class="GtkEntry" id="cfg_Qemu_append_text">
+                                      <widget class="GtkEntry" id="cfg_Qemu_kopt_text">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="invisible_char">&#x25CF;</property>
@@ -4927,6 +4927,7 @@
                     <property name="items" translatable="yes">Auto
 raw
 qcow
+qcow2
 cow
 vmdk
 cloop</property>
@@ -5657,6 +5658,38 @@
       </widget>
     </child>
     <child>
+      <widget class="GtkMenuItem" id="vmsuspend">
+        <property name="visible">True</property>
+        <property name="sensitive">False</property>
+        <property name="label" translatable="yes">Suspend Qemu</property>
+        <property name="use_underline">True</property>
+        <signal name="activate" handler="on_vm_suspend"/>
+      </widget>
+    </child>
+    <child>
+      <widget class="GtkMenuItem" id="vmpoweroff">
+        <property name="visible">True</property>
+        <property name="sensitive">False</property>
+        <property name="label" translatable="yes">Send ACPI poweroff</property>
+        <property name="use_underline">True</property>
+        <signal name="activate" handler="on_vm_powerbutton"/>
+      </widget>
+    </child>
+    <child>
+      <widget class="GtkMenuItem" id="vmhardreset">
+        <property name="visible">True</property>
+        <property name="sensitive">False</property>
+        <property name="label" translatable="yes">Send ACPI hard reset</property>
+        <property name="use_underline">True</property>
+        <signal name="activate" handler="on_vm_hardreset"/>
+      </widget>
+    </child>
+    <child>
+      <widget class="GtkSeparatorMenuItem" id="&lt;separator&gt;">
+        <property name="visible">True</property>
+      </widget>
+    </child>
+    <child>
       <widget class="GtkImageMenuItem" id="item_reset_job">
         <property name="label">reset job</property>
         <property name="visible">True</property>
@@ -6687,6 +6720,15 @@
       </widget>
     </child>
     <child>
+      <widget class="GtkMenuItem" id="vmresume">
+        <property name="visible">True</property>
+        <property name="sensitive">False</property>
+        <property name="label" translatable="yes">Resume VM</property>
+        <property name="use_underline">True</property>
+        <signal name="activate" handler="on_vm_resume"/>
+      </widget>
+    </child>
+    <child>
       <widget class="GtkMenuItem" id="configure_brick_action">
         <property name="visible">True</property>
         <property name="label" translatable="yes">Configure</property>

=== modified file 'virtualbricks_BrickFactory.py'
--- virtualbricks_BrickFactory.py	2011-01-29 19:10:34 +0000
+++ virtualbricks_BrickFactory.py	2011-01-30 10:15:09 +0000
@@ -114,12 +114,23 @@
 class BrickConfig():
 	def set(self,attr):
 		kv = attr.split("=")
-		if len(kv) != 2:
+		if len(kv) < 2:
 			return False
 		else:
-			print "setting %s to '%s'" % (kv[0], kv[1])
+			val = ''
+			if (len(kv)) > 2:
+				val='"'
+				for c in kv[1:]:
+					val+=c.lstrip('"').rstrip('"')
+					val+="="
+				val = val.rstrip('=') + '"'
+				
+			else:
+				val+=kv[1]
+
+			print "setting %s to '%s'" % (kv[0], val)
 			# pure magic. I love python.
-			self.__dict__[kv[0]] = kv[1]
+			self.__dict__[kv[0]] = val
 
 		
       
@@ -313,18 +324,25 @@
 		if (self.proc == None):
 			return False
 		if self.pid > 0:
+				
+				
 			if (self.needsudo):
 				os.system(self.settings.get('sudo') + ' "kill '+ str(self.pid) + '"')
+			elif self.internal_console is not None and self.get_type() != "Qemu":
+				self.send('shutdown\n')
+				print self.recv()
 			else:
 				try:
 					os.kill(self.proc.pid, 15)
 				except:
 					pass
-			self.proc.wait()
+			if(self.proc.poll()==None):
+				return
 		self.proc = None
 		self.need_restart_to_apply_changes = False
 		if self.close_internal_console and callable(self.close_internal_console):
 			self.close_internal_console()
+		self.internal_console == None
 		self.post_poweroff()
 
 	def post_poweron(self):
@@ -366,8 +384,11 @@
 	def send(self,msg):
 		if self.internal_console == None:
 			return
-		print "= sending " + msg
-		self.internal_console.send(msg)
+		try:
+			print "= sending " + msg
+			self.internal_console.send(msg)
+		except:
+			print "send failed"
 
 	def recv(self):
 		if self.internal_console == None:
@@ -825,7 +846,7 @@
 		self.cfg.initrd=""
 		self.cfg.gdb=""
 		self.cfg.gdbport=""	
-		self.cfg.append=""
+		self.cfg.kopt=""
 			
 		self.command_builder = {
 			'#argv0':'argv0',
@@ -878,7 +899,7 @@
 			##acpitable not supported
 			##smbios not supported
 			'-kernel':'kernel',
-			'#append':'append',
+			'-append':'kopt',
 			'-initrd':'initrd',
 			#'-serial':'serial',
 			#'-parallel':'parallel',
@@ -898,7 +919,7 @@
 			'#kvm':'kvm',
 			#'-no-reboot':'', ## not supported
 			#'-no-shutdown':'', ## not supported
-			#'-loadvm':'',
+			'-loadvm':'loadvm',
 			#'-daemonize':'', ## not supported
 			#'-option-rom':'',
 			#'-clock':'',
@@ -1008,9 +1029,12 @@
 		if (self.cfg.rtc== "*"):
 			res.append('-rtc')
 			res.append('base=localtime')
-		
-		if (self.cfg.append != ""):
-		    res.append(self.cfg.append);
+
+		res.append("-mon")
+		res.append("chardev=mon")
+		res.append("-chardev")
+		res.append('socket,id=mon,path='+Settings.MYPATH + '/' + self.name + '.mgmt,server')
+		self.cfg.console=Settings.MYPATH + '/' + self.name + '.mgmt'
 		print res
 		return res
 

=== modified file 'virtualbricks_GUI.py'
--- virtualbricks_GUI.py	2011-01-29 19:10:34 +0000
+++ virtualbricks_GUI.py	2011-01-30 10:15:09 +0000
@@ -10,6 +10,7 @@
 import gobject
 import time
 import pygraphviz as pgv
+import subprocess
 
 
 
@@ -734,6 +735,10 @@
 		self.Dragging = self.brickfactory.getbrickbyname(name)
 		if event.button == 3:
 			self.selected = self.brickfactory.getbrickbyname(name)
+			if self.selected.get_type() == "Qemu":
+				self.set_sensitivegroup(['vmresume'])
+			else:
+				self.set_nonsensitivegroup(['vmresume'])
 			if self.selected:
 				self.show_window('menu_brickactions')
 
@@ -774,6 +779,8 @@
 		if b.proc is not None:
 			b.poweroff()
 		else:
+			if b.get_type() == "Qemu":
+				b.cfg.loadvm=''
 			try:
 				b.poweron()
 			except(BrickFactory.BadConfigException):
@@ -808,6 +815,11 @@
 		name = self.get_treeselected_name(tree, store, pthinfo)
 		if event.button == 3:
 			self.joblist_selected = self.brickfactory.getbrickbyname(name)
+			if self.joblist_selected.get_type()=="Qemu":
+				self.set_sensitivegroup(['vmsuspend', 'vmpoweroff', 'vmhardreset'])
+			else:
+				self.set_nonsensitivegroup(['vmsuspend', 'vmpoweroff', 'vmhardreset'])
+				
 			if self.joblist_selected:
 				self.show_window('menu_popup_joblist')
 		pass
@@ -1046,10 +1058,7 @@
 		pass
 	
 	def on_item_jobmonoitor_activate(self, widget=None, data=""):
-		if self.joblist_selected.get_type() is "Qemu":
-			self.show_window('dialog_jobmonitor')
-		else:
-			self.joblist_selected.open_console()
+		self.joblist_selected.open_console()
 		pass
 	
 	def on_item_stop_job_activate(self, widget=None, data=""):
@@ -1469,6 +1478,42 @@
 			self.gladefile.get_widget('tap_ipconfig').set_sensitive(True)
 		else:
 			self.gladefile.get_widget('tap_ipconfig').set_sensitive(False)
+	
+	def on_vm_suspend(self, widget=None, event=None, data=""):
+		hda = self.joblist_selected.cfg.get('basehda')
+		if hda is None or 0 != subprocess.Popen(["qemu-img","snapshot","-c","virtualbricks",hda]).wait():
+			self.error("Suspend/Resume not supported on this disk.")
+			return
+		self.joblist_selected.recv()
+		self.joblist_selected.send("savevm virtualbricks\n")
+		while(not self.joblist_selected.recv().startswith("(qemu")):
+			print ".",
+			time.sleep(1)
+		print
+		self.joblist_selected.poweroff()
+
+	def on_vm_resume(self, widget=None, event=None, data=""):
+		hda = self.selected.cfg.get('basehda')
+		print "resume"
+		if os.system("qemu-img snapshot -l "+hda+" |grep virtualbricks") == 0:
+			if self.selected.proc is not None:
+				self.selected.send("loadvm virtualbricks\n")
+				self.selected.recv()
+				return
+			else:
+				self.selected.cfg.set("loadvm=virtualbricks")
+				self.selected.poweron()
+		else:
+			self.error("Cannot find suspend point.")
+		
+		
+	def on_vm_powerbutton(self, widget=None, event=None, data=""):
+		self.joblist_selected.send("system_powerdown\n")
+		self.joblist_selected.recv()
+
+	def on_vm_hardreset(self, widget=None, event=None, data=""):
+		self.joblist_selected.send("system_reset\n")
+		self.joblist_selected.recv()
 		
 			
 	def signals(self):
@@ -1598,7 +1643,11 @@
 			"on_random_macaddr":self.on_random_macaddr,
 			"on_tap_config_manual":self.on_tap_config_manual,
 			"on_check_kvm_toggled":self.on_check_kvm_toggled,
-			"on_button_newimage_close_clicked": self.on_newimage_close_clicked
+			"on_button_newimage_close_clicked": self.on_newimage_close_clicked,
+			"on_vm_suspend":self.on_vm_suspend,
+			"on_vm_powerbutton":self.on_vm_powerbutton,
+			"on_vm_hardreset":self.on_vm_hardreset,
+			"on_vm_resume":self.on_vm_resume,
 		}
 		self.gladefile.signal_autoconnect(self.signaldict)