diff options
| author | Ewan Mellor <ewan@xensource.com> | 2006-11-01 08:38:22 +0000 |
|---|---|---|
| committer | Ewan Mellor <ewan@xensource.com> | 2006-11-01 08:38:22 +0000 |
| commit | 240c6346f7701456333ee5031b81e772a51a2414 (patch) | |
| tree | b2cb2e573b1a00f486559a7600853d55f15b68e9 /tools/xm-test | |
| parent | c51e990ede4de5a9e43446956a2c06f8fbdb6585 (diff) | |
| download | xen-240c6346f7701456333ee5031b81e772a51a2414.tar.gz xen-240c6346f7701456333ee5031b81e772a51a2414.tar.bz2 xen-240c6346f7701456333ee5031b81e772a51a2414.zip | |
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>
Diffstat (limited to 'tools/xm-test')
| -rw-r--r-- | tools/xm-test/tests/create/14_create_blockroot_pos.py | 11 |
1 files changed, 3 insertions, 8 deletions
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() |