ia64/xen-unstable

changeset 2571:3af1c3b54760

bitkeeper revision 1.1159.96.2 (415bed53ySdlyVimTpmTb6lR8dzOdw)

Merge xenbk@gandalf:/var/bk/xeno-unstable.bk
into wray-m-3.hpl.hp.com:/home/mjw/repos-bk/xeno-unstable.bk
author mjw@wray-m-3.hpl.hp.com
date Thu Sep 30 11:26:11 2004 +0000 (2004-09-30)
parents e9d6f07d0e52 30a9b33481dc
children a15ab016f0c6
files tools/python/xen/xend/XendMigrate.py tools/python/xen/xend/server/SrvDomainDir.py
line diff
     1.1 --- a/tools/python/xen/xend/XendMigrate.py	Wed Sep 29 13:16:35 2004 +0000
     1.2 +++ b/tools/python/xen/xend/XendMigrate.py	Thu Sep 30 11:26:11 2004 +0000
     1.3 @@ -295,6 +295,11 @@ class XendMigrateInfo(XfrdInfo):
     1.4          eserver.inject('xend.domain.migrate',
     1.5                         [ self.dominfo.name, self.dominfo.id,
     1.6                           "begin", self.sxpr() ])
     1.7 +        # Special case for localhost: destroy all devices early.
     1.8 +        if 0 and self.dst_host in ["localhost", "127.0.0.1"]:
     1.9 +            self.dominfo.restart_cancel()
    1.10 +            self.dominfo.cleanup()
    1.11 +            #self.dominfo.destroy_console()
    1.12          xfrd.request(['xfr.migrate',
    1.13                        self.src_dom,
    1.14                        vmconfig,
     2.1 --- a/tools/python/xen/xend/server/SrvDomainDir.py	Wed Sep 29 13:16:35 2004 +0000
     2.2 +++ b/tools/python/xen/xend/server/SrvDomainDir.py	Thu Sep 30 11:26:11 2004 +0000
     2.3 @@ -45,7 +45,7 @@ class SrvDomainDir(SrvDir):
     2.4          errmsg = ''
     2.5          try:
     2.6              configstring = req.args.get('config')[0]
     2.7 -            print 'config:', configstring
     2.8 +            #print 'op_create>', 'config:', configstring
     2.9              pin = sxp.Parser()
    2.10              pin.input(configstring)
    2.11              pin.input_eof()