ia64/xen-unstable

changeset 17560:706395167701

Remove unimplemented xm migrate --resource option.

Signed-off-by: Gary Pennington <gary.pennington@sun.com>
author Keir Fraser <keir.fraser@citrix.com>
date Thu May 01 16:35:49 2008 +0100 (2008-05-01)
parents 84a066b9e57a
children acdc1814d29b
files tools/python/xen/xend/XendDomain.py tools/python/xen/xend/server/SrvDomain.py tools/python/xen/xm/migrate.py
line diff
     1.1 --- a/tools/python/xen/xend/XendDomain.py	Thu May 01 16:35:28 2008 +0100
     1.2 +++ b/tools/python/xen/xend/XendDomain.py	Thu May 01 16:35:49 2008 +0100
     1.3 @@ -1258,7 +1258,7 @@ class XendDomain:
     1.4  
     1.5          return val       
     1.6  
     1.7 -    def domain_migrate(self, domid, dst, live=False, resource=0, port=0, node=-1):
     1.8 +    def domain_migrate(self, domid, dst, live=False, port=0, node=-1):
     1.9          """Start domain migration.
    1.10          
    1.11          @param domid: Domain ID or Name
    1.12 @@ -1269,7 +1269,6 @@ class XendDomain:
    1.13          @type port: int        
    1.14          @keyword live: Live migration
    1.15          @type live: bool
    1.16 -        @keyword resource: not used??
    1.17          @rtype: None
    1.18          @keyword node: use node number for target
    1.19          @rtype: int 
     2.1 --- a/tools/python/xen/xend/server/SrvDomain.py	Thu May 01 16:35:28 2008 +0100
     2.2 +++ b/tools/python/xen/xend/server/SrvDomain.py	Thu May 01 16:35:49 2008 +0100
     2.3 @@ -115,7 +115,6 @@ class SrvDomain(SrvDir):
     2.4                      [['dom',         'int'],
     2.5                       ['destination', 'str'],
     2.6                       ['live',        'int'],
     2.7 -                     ['resource',    'int'],
     2.8                       ['port',        'int']])
     2.9          return fn(req.args, {'dom': self.dom.domid})
    2.10  
     3.1 --- a/tools/python/xen/xm/migrate.py	Thu May 01 16:35:28 2008 +0100
     3.2 +++ b/tools/python/xen/xm/migrate.py	Thu May 01 16:35:49 2008 +0100
     3.3 @@ -47,10 +47,6 @@ gopts.opt('node', short='n', val='nodenu
     3.4            fn=set_int, default=-1,
     3.5            use="Use specified NUMA node on target.")
     3.6  
     3.7 -gopts.opt('resource', short='r', val='MBIT',
     3.8 -          fn=set_int, default=0,
     3.9 -          use="Set level of resource usage for migration.")
    3.10 -
    3.11  def help():
    3.12      return str(gopts)
    3.13      
    3.14 @@ -69,13 +65,11 @@ def main(argv):
    3.15          vm_ref = get_single_vm(dom)
    3.16          other_config = {
    3.17              "port":     opts.vals.port,
    3.18 -            "resource": opts.vals.resource,
    3.19              "node":     opts.vals.node
    3.20              }
    3.21          server.xenapi.VM.migrate(vm_ref, dst, bool(opts.vals.live),
    3.22                                   other_config)
    3.23      else:
    3.24          server.xend.domain.migrate(dom, dst, opts.vals.live,
    3.25 -                                   opts.vals.resource,
    3.26                                     opts.vals.port,
    3.27                                     opts.vals.node)