ia64/xen-unstable

changeset 8266:91046e4a49dd

Merged.
author emellor@leeni.uk.xensource.com
date Wed Dec 07 11:51:31 2005 +0000 (2005-12-07)
parents 653d38c8fbc8 25dd49641a74
children 5f574f9cb4bd
files
line diff
     1.1 --- a/tools/examples/block	Wed Dec 07 11:50:55 2005 +0000
     1.2 +++ b/tools/examples/block	Wed Dec 07 11:51:31 2005 +0000
     1.3 @@ -133,7 +133,7 @@ same_vm()
     1.4    local thisvm=$(xenstore-read "/local/domain/$thisdom/vm")
     1.5    local othervm=$(xenstore-read "/local/domain/$otherdom/vm")
     1.6  
     1.7 -  return [ "$thisvm" == "$othervm" ]
     1.8 +  [ "$thisvm" == "$othervm" ]
     1.9  }
    1.10  
    1.11  
     2.1 --- a/tools/xm-test/lib/XmTestReport/OSReport.py	Wed Dec 07 11:50:55 2005 +0000
     2.2 +++ b/tools/xm-test/lib/XmTestReport/OSReport.py	Wed Dec 07 11:51:31 2005 +0000
     2.3 @@ -102,6 +102,11 @@ class Machine:
     2.4          xen = self.__getXenInfo(xenValues)
     2.5          cpu = self.__getCpuInfo(cpuValues)
     2.6  
     2.7 +        if cpu["model_name"] == "Unknown":   
     2.8 +            cpuValues={"arch"  : "Unknown",
     2.9 +                       "features": "Unknown"}
    2.10 +            cpu=self.__getCpuInfo(cpuValues)
    2.11 +
    2.12          for k in xen.keys():
    2.13              self.values[k] = xen[k]
    2.14              if xen[k] == "Unknown":