Remove unimplemented xm migrate --resource option.

Signed-off-by: Gary Pennington <gary.pennington@sun.com>

diff --git a/tools/python/xen/xend/XendDomain.py b/tools/python/xen/xend/XendDomain.py
index e821329400b4900e9e1d77110f8a82321f3db241..6e93795675022ff2eea9c84e1f67c749d48c6f1f 100644 (file)
--- a/tools/python/xen/xend/XendDomain.py
+++ b/tools/python/xen/xend/XendDomain.py
@@ -1258,7 +1258,7 @@ class XendDomain:
 
         return val       
 
-    def domain_migrate(self, domid, dst, live=False, resource=0, port=0, node=-1):
+    def domain_migrate(self, domid, dst, live=False, port=0, node=-1):
         """Start domain migration.
         
         @param domid: Domain ID or Name
@@ -1269,7 +1269,6 @@ class XendDomain:
         @type port: int        
         @keyword live: Live migration
         @type live: bool
-        @keyword resource: not used??
         @rtype: None
         @keyword node: use node number for target
         @rtype: int 

diff --git a/tools/python/xen/xend/server/SrvDomain.py b/tools/python/xen/xend/server/SrvDomain.py
index f6cc35c133511b12426a91831dba99c4aa4d927b..92944ae06d05200a588db825c6ded8430323ee61 100644 (file)
--- a/tools/python/xen/xend/server/SrvDomain.py
+++ b/tools/python/xen/xend/server/SrvDomain.py
@@ -115,7 +115,6 @@ class SrvDomain(SrvDir):
                     [['dom',         'int'],
                      ['destination', 'str'],
                      ['live',        'int'],
-                     ['resource',    'int'],
                      ['port',        'int']])
         return fn(req.args, {'dom': self.dom.domid})
 

diff --git a/tools/python/xen/xm/migrate.py b/tools/python/xen/xm/migrate.py
index 535cc3a2d0ccbab13f0e2368b472c64171f6f7bf..ace3ba7f34d4c2f77d9fa8766ca05f9f245dfeee 100644 (file)
--- a/tools/python/xen/xm/migrate.py
+++ b/tools/python/xen/xm/migrate.py
@@ -47,10 +47,6 @@ gopts.opt('node', short='n', val='nodenum',
           fn=set_int, default=-1,
           use="Use specified NUMA node on target.")
 
-gopts.opt('resource', short='r', val='MBIT',
-          fn=set_int, default=0,
-          use="Set level of resource usage for migration.")
-
 def help():
     return str(gopts)
     
@@ -69,13 +65,11 @@ def main(argv):
         vm_ref = get_single_vm(dom)
         other_config = {
             "port":     opts.vals.port,
-            "resource": opts.vals.resource,
             "node":     opts.vals.node
             }
         server.xenapi.VM.migrate(vm_ref, dst, bool(opts.vals.live),
                                  other_config)
     else:
         server.xend.domain.migrate(dom, dst, opts.vals.live,
-                                   opts.vals.resource,
                                    opts.vals.port,
                                    opts.vals.node)