ia64/xen-unstable

changeset 2246:2f6326715a73

bitkeeper revision 1.1159.1.66 (4120760aHfbIf2nixUgYmOxeE8yRRg)

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 Mon Aug 16 08:52:15 2004 +0000 (2004-08-16)
parents c3e3a082384f 917e2429d7c7
children 929e4eab6e66
files tools/python/xen/xend/XendDomainInfo.py tools/python/xen/xm/main.py
line diff
     1.1 --- a/tools/python/xen/xend/XendDomainInfo.py	Mon Aug 16 08:53:29 2004 +0000
     1.2 +++ b/tools/python/xen/xend/XendDomainInfo.py	Mon Aug 16 08:52:15 2004 +0000
     1.3 @@ -465,6 +465,7 @@ class XendDomainInfo:
     1.4          @param name: name
     1.5          @raise: VMerror if invalid
     1.6          """
     1.7 +        if self.recreate: return
     1.8          if name is None or name == '':
     1.9              raise VmError('missing vm name')
    1.10          if name[0] in string.digits:
     2.1 --- a/tools/python/xen/xm/main.py	Mon Aug 16 08:53:29 2004 +0000
     2.2 +++ b/tools/python/xen/xm/main.py	Mon Aug 16 08:52:15 2004 +0000
     2.3 @@ -302,7 +302,7 @@ class ProgMigrate(Prog):
     2.4      info = """Migrate a domain to another machine."""
     2.5  
     2.6      def help(self, args):
     2.7 -        migrate.help(arg)
     2.8 +        migrate.help(args)
     2.9      
    2.10      def main(self, args):
    2.11          migrate.main(args)