[Xen-changelog] Merged.

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User emellor@xxxxxxxxxxxxxxxxxxxxxx
# Node ID 91046e4a49dd4ab33451d7fee479a450a32d8684
# Parent  653d38c8fbc8d3d1b5dbac21c180fedeccb272b3
# Parent  25dd49641a7486d8706640011b4be9baaf64079f
Merged.

diff -r 653d38c8fbc8 -r 91046e4a49dd tools/examples/block
--- a/tools/examples/block      Wed Dec  7 11:50:55 2005
+++ b/tools/examples/block      Wed Dec  7 11:51:31 2005
@@ -133,7 +133,7 @@
   local thisvm=$(xenstore-read "/local/domain/$thisdom/vm")
   local othervm=$(xenstore-read "/local/domain/$otherdom/vm")
 
-  return [ "$thisvm" == "$othervm" ]
+  [ "$thisvm" == "$othervm" ]
 }
 
 
diff -r 653d38c8fbc8 -r 91046e4a49dd tools/xm-test/lib/XmTestReport/OSReport.py
--- a/tools/xm-test/lib/XmTestReport/OSReport.py        Wed Dec  7 11:50:55 2005
+++ b/tools/xm-test/lib/XmTestReport/OSReport.py        Wed Dec  7 11:51:31 2005
@@ -102,6 +102,11 @@
         xen = self.__getXenInfo(xenValues)
         cpu = self.__getCpuInfo(cpuValues)
 
+        if cpu["model_name"] == "Unknown":   
+            cpuValues={"arch"  : "Unknown",
+                       "features": "Unknown"}
+            cpu=self.__getCpuInfo(cpuValues)
+
         for k in xen.keys():
             self.values[k] = xen[k]
             if xen[k] == "Unknown":

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