2009-12-02 Ghee Teo <[email protected]>
authorgheet
Wed, 02 Dec 2009 13:12:52 +0000
changeset 17086 2ff0733e53d0
parent 17085 9d8cb4237224
child 17087 6e78a2dd6d69
2009-12-02 Ghee Teo <[email protected]> Fixes 6886658. provide text console for PV. * base-specs/virt-manager.spec: * patches/virt-manager-16-pv-serial-console.diff:
ChangeLog
base-specs/virt-manager.spec
patches/virt-manager-16-pv-serial-console.diff
--- a/ChangeLog	Wed Dec 02 09:56:23 2009 +0000
+++ b/ChangeLog	Wed Dec 02 13:12:52 2009 +0000
@@ -1,3 +1,9 @@
+2009-12-02  Ghee Teo  <[email protected]>
+
+	Fixes 6886658. provide text console for PV.
+	* base-specs/virt-manager.spec:
+	* patches/virt-manager-16-pv-serial-console.diff:
+
 2009-12-02  Li Yuan  <[email protected]>
 
 	* SUNWgnome-a11y-reader.spec: Update dependency.
--- a/base-specs/virt-manager.spec	Wed Dec 02 09:56:23 2009 +0000
+++ b/base-specs/virt-manager.spec	Wed Dec 02 13:12:52 2009 +0000
@@ -80,9 +80,12 @@
 # date:2009-09-03 owner:mattman type:bug bugster:6877275
 Patch14:       virt-manager-14-disable-local-sound.diff
 
-# date:2009-10-05 owner:mattman type:bug bugster:688665
+# date:2009-10-05 owner:mattman type:bug bugster:6886665
 Patch15:       virt-manager-15-status-refresh-interval.diff
 
+# date:2009-12-02 owner:gheet type:bug bugster:6886658
+Patch16:       virt-manager-16-pv-serial-console.diff
+
 %description
 Virtual Machine Manager
 
@@ -103,6 +106,7 @@
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
+%patch16 -p1
 
 %build
 %ifos linux
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/virt-manager-16-pv-serial-console.diff	Wed Dec 02 13:12:52 2009 +0000
@@ -0,0 +1,13 @@
+diff -urN virt-manager-0.6.1/src/virtManager/domain.py ../SUNWvirt-manager-0.6.1.hacked/virt-manager-0.6.1/src/virtManager/domain.py
+--- virt-manager-0.6.1/src/virtManager/domain.py	2009-01-26 19:33:33.000000000 +0000
++++ ../SUNWvirt-manager-0.6.1.hacked/virt-manager-0.6.1/src/virtManager/domain.py	2009-12-02 11:58:16.226281287 +0000
+@@ -566,6 +566,9 @@
+             # [ Name, device type, source path
+             serial_list = []
+             devs = ctx.xpathEval("/domain/devices/serial")
++            if (len(devs) == 0):
++                devs = ctx.xpathEval("/domain/devices/console")
++
+             for node in devs:
+                 name = "Serial "
+                 dev_type = node.prop("type")