Re: [XenPPC] Re: xm-test

[Tony Breeds <tony@xxxxxxxxxxxxxxxxxx>]

On Fri, Sep 15, 2006 at 02:55:36PM +1000, Tony Breeds wrote:

> See I said therie'd be more.

This patch allows "runtest" to generate a valid OSReport.
It will actually start to run regression tests now but they hang early
on in the domU boot process.  I need to look into why.

Basically to get xm-test into shape we're going to follow Hollis' lead
and generate arch appropriate functions, as it seesm to bve very x86
specific.

I've placed a combined patch at http://bakeyournoodle.com/~tony/xm-test/
if you're interested.
---

 tools/xm-test/lib/XmTestLib/XenDomain.py   |    8 +++++++-
 tools/xm-test/lib/XmTestReport/OSReport.py |   10 +++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

---
diff -r 490174d8aa7b023fb8787d74c6144ede212e6c6e -r 
ba5a42e72fbe191527a1b321c6d0bfedf1ecbf06 
tools/xm-test/lib/XmTestLib/XenDomain.py
--- a/tools/xm-test/lib/XmTestLib/XenDomain.py  Fri Sep 15 14:45:23 2006 +1000
+++ b/tools/xm-test/lib/XmTestLib/XenDomain.py  Fri Sep 15 17:17:27 2006 +1000
@@ -41,12 +41,18 @@ def getDeviceModel():
     else:
         return "/usr/lib/xen/bin/qemu-dm"
 
-def getDefaultKernel():
+def x86_getDefaultKernel():
     """Get the path to the default DomU kernel"""
     dom0Ver = commands.getoutput("uname -r");
     domUVer = dom0Ver.replace("xen0", "xenU");
     
     return "/boot/vmlinuz-" + domUVer;
+
+def powerpc_getDefaultKernel():
+   return "/root/vmlinux.strip";
+
+def getDefaultKernel():
+    return powerpc_getDefaultKernel()
 
 def getUniqueName():
     """Get a uniqueish name for use in a domain"""
diff -r 490174d8aa7b023fb8787d74c6144ede212e6c6e -r 
ba5a42e72fbe191527a1b321c6d0bfedf1ecbf06 
tools/xm-test/lib/XmTestReport/OSReport.py
--- a/tools/xm-test/lib/XmTestReport/OSReport.py        Fri Sep 15 14:45:23 
2006 +1000
+++ b/tools/xm-test/lib/XmTestReport/OSReport.py        Fri Sep 15 17:17:27 
2006 +1000
@@ -102,9 +102,13 @@ class Machine:
         xen = self.__getXenInfo(xenValues)
         cpu = self.__getCpuInfo(cpuValues)
 
-        if cpu["model_name"] == "Unknown":   
-            cpuValues={"arch"  : "Unknown",
-                       "features": "Unknown"}
+        if cpu["model_name"] == "Unknown":
+           if os.uname()[4] == "ppc64":
+                cpuValues={"cpu"  : "Unknown",
+                           "revision": "Unknown"}
+           else:
+                cpuValues={"arch"  : "Unknown",
+                           "features": "Unknown"}
             cpu=self.__getCpuInfo(cpuValues)
 
         for k in xen.keys():


---

Yours Tony

   linux.conf.au       http://linux.conf.au/ || http://lca2007.linux.org.au/
   Jan 15-20 2007      The Australian Linux Technical Conference!


_______________________________________________
Xen-ppc-devel mailing list
Xen-ppc-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-ppc-devel