# HG changeset patch
# User john.levon@xxxxxxx
# Date 1209521786 25200
# Node ID 14dba82712bdde41024e774147319d571918cf33
# Parent 1f1f69a224575e2ce1e83e0ba8fc2a0f82ca0e99
Remove unimplemented xm migrate --resource option.
Signed-off-by: Gary Pennington <gary.pennington@xxxxxxx>
diff --git a/tools/python/xen/xend/XendDomain.py
b/tools/python/xen/xend/XendDomain.py
--- 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
--- 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
--- a/tools/python/xen/xm/migrate.py
+++ b/tools/python/xen/xm/migrate.py
@@ -47,10 +47,6 @@ gopts.opt('node', short='n', val='nodenu
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)
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
|
Home