[Xen-changelog] [xen-unstable] [xm-test] Set "console=xvc0" for xm-test guests on Intel architecture platforms.

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

# HG changeset patch
# User James Bulpin <james@xxxxxxxxxxxxx>
# Date 1189534262 -3600
# Node ID fec8b52b1a7fa7c7f6a86a3e079880849556caeb
# Parent  5352a7cc4f2ab3e5b79cfb8d8a25a670946d41dd
[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@xxxxxxxxxxxxx>
---
 tools/xm-test/lib/XmTestLib/arch.py |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletion(-)

diff -r 5352a7cc4f2a -r fec8b52b1a7f tools/xm-test/lib/XmTestLib/arch.py
--- a/tools/xm-test/lib/XmTestLib/arch.py       Tue Sep 11 17:02:03 2007 +0100
+++ b/tools/xm-test/lib/XmTestLib/arch.py       Tue Sep 11 19:11:02 2007 +0100
@@ -70,6 +70,7 @@ ia_ParavirtDefaults = {"memory"       : 
                        "kernel"       : ia_getDefaultKernel(),
                        "root"         : "/dev/ram0",
                        "ramdisk"      : getRdPath() + "/initrd.img",
+                       "extra"        : "console=xvc0",
 }
 ia_HVMDefaults =      {"memory"       : 64,
                        "vcpus"        : 1,
@@ -147,7 +148,11 @@ if _arch == "x86" or _arch == "x86_64" o
     # expects one.  This will fail with a gzip-ed image. 
     if configDefaults['ramdisk']:
         rd_size = os.stat(configDefaults['ramdisk']).st_size
-        configDefaults['extra'] = 'ramdisk_size=' + str((rd_size / 1024)+1)
+        clause = 'ramdisk_size=' + str((rd_size / 1024)+1)
+        if configDefaults.has_key('extra'):
+            configDefaults['extra'] = configDefaults['extra'] + " " + clause
+        else:
+            configDefaults['extra'] = clause
 
     if _arch == "ia64":
         minSafeMem = ia64_minSafeMem

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