ia64/xen-unstable

changeset 15879:fec8b52b1a7f

[xm-test] Set "console=xvc0" for xm-test guests on Intel architecture platforms.
Tests have been failing because the console for the test ramdisk wasn't using
xvc0 so testcases were not able to interact with it.

Signed-off-by: James Bulpin <james@xensource.com>
author James Bulpin <james@xensource.com>
date Tue Sep 11 19:11:02 2007 +0100 (2007-09-11)
parents 5352a7cc4f2a
children c94683db19e9 a00cc97b392a
files tools/xm-test/lib/XmTestLib/arch.py
line diff
     1.1 --- a/tools/xm-test/lib/XmTestLib/arch.py	Tue Sep 11 17:02:03 2007 +0100
     1.2 +++ b/tools/xm-test/lib/XmTestLib/arch.py	Tue Sep 11 19:11:02 2007 +0100
     1.3 @@ -70,6 +70,7 @@ ia_ParavirtDefaults = {"memory"       : 
     1.4                         "kernel"       : ia_getDefaultKernel(),
     1.5                         "root"         : "/dev/ram0",
     1.6                         "ramdisk"      : getRdPath() + "/initrd.img",
     1.7 +                       "extra"        : "console=xvc0",
     1.8  }
     1.9  ia_HVMDefaults =      {"memory"       : 64,
    1.10                         "vcpus"        : 1,
    1.11 @@ -147,7 +148,11 @@ if _arch == "x86" or _arch == "x86_64" o
    1.12      # expects one.  This will fail with a gzip-ed image. 
    1.13      if configDefaults['ramdisk']:
    1.14          rd_size = os.stat(configDefaults['ramdisk']).st_size
    1.15 -        configDefaults['extra'] = 'ramdisk_size=' + str((rd_size / 1024)+1)
    1.16 +        clause = 'ramdisk_size=' + str((rd_size / 1024)+1)
    1.17 +        if configDefaults.has_key('extra'):
    1.18 +            configDefaults['extra'] = configDefaults['extra'] + " " + clause
    1.19 +        else:
    1.20 +            configDefaults['extra'] = clause
    1.21  
    1.22      if _arch == "ia64":
    1.23          minSafeMem = ia64_minSafeMem