From: Ewan Mellor <ewan@xensource.com>
Date: Wed, 1 Nov 2006 08:38:22 +0000 (+0000)
Subject: The XenDomain class does not respect the arch defaults where
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15567^2~74
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=240c6346f7701456333ee5031b81e772a51a2414;p=xen.git

The XenDomain class does not respect the arch defaults where
as XmTestDomain does.  This part of the patch forces both HVM and
non-HVM tests to use XmTestDomain.  With appropriate changes to the
extraConfig arg.

On PPC we need to use the arch defaults to get the console setup
correctly.

Signed-off-by: Tony Breeds <tony@bakeyournoodle.com>
---

diff --git a/tools/xm-test/tests/create/14_create_blockroot_pos.py b/tools/xm-test/tests/create/14_create_blockroot_pos.py
index 58eeb2b9b3..79dd622b5a 100644
--- a/tools/xm-test/tests/create/14_create_blockroot_pos.py
+++ b/tools/xm-test/tests/create/14_create_blockroot_pos.py
@@ -18,17 +18,12 @@ rdpath = getRdPath()
 #     print "Using %s" % output
 
 if ENABLE_HVM_SUPPORT:
-    domain = XmTestDomain(name="14_create_blockroot")
+    config = None
 else:
-    config = {"memory" : "64",
-              "root"   : "/dev/hda1",
-              "name"   : "14_create_blockroot",
-              "kernel" : getDefaultKernel(),
+    config = {"root"   : "/dev/hda1",
               "disk"   : "file:%s/initrd.img,hda1,w" % rdpath
               }
-    domConfig = XenConfig()
-    domConfig.setOpts(config)
-    domain = XenDomain(name=domConfig.getOpt("name"), config=domConfig)
+domain = XmTestDomain(name="14_create_blockroot", extraConfig=config)
 
 try:
     console = domain.start()