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

tools/python/xen/xend/XendMigrate.py

@@ -295,6 +295,11 @@ class XendMigrateInfo(XfrdInfo):
         eserver.inject('xend.domain.migrate',
                        [ self.dominfo.name, self.dominfo.id,
                          "begin", self.sxpr() ])
+        # Special case for localhost: destroy all devices early.
+        if 0 and self.dst_host in ["localhost", "127.0.0.1"]:
+            self.dominfo.restart_cancel()
+            self.dominfo.cleanup()
+            #self.dominfo.destroy_console()
         xfrd.request(['xfr.migrate',
                       self.src_dom,
                       vmconfig,

tools/python/xen/xend/server/SrvDomainDir.py

@@ -45,7 +45,7 @@ class SrvDomainDir(SrvDir):
         errmsg = ''
         try:
             configstring = req.args.get('config')[0]
-            print 'config:', configstring
+            #print 'op_create>', 'config:', configstring
             pin = sxp.Parser()
             pin.input(configstring)
             pin.input_eof()