# HG changeset patch
# User john.levon@xxxxxxx
# Date 1181229858 25200
# Node ID e46be7b5f9bf2b17f66c82950b4fc3962e1266d0
# Parent 2a188f88483d726cb5b880f948a1baeeb2bd42a1
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
@@ -1192,7 +1192,7 @@ class XendDomain:
return val
- def domain_migrate(self, domid, dst, live=False, resource=0, port=0):
+ def domain_migrate(self, domid, dst, live=False, port=0):
"""Start domain migration.
@param domid: Domain ID or Name
@@ -1203,7 +1203,6 @@ class XendDomain:
@type port: int
@keyword live: Live migration
@type live: bool
- @keyword resource: not used??
@rtype: None
@raise XendError: Failed to migrate
@raise XendInvalidDomain: Domain is not valid
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
@@ -43,10 +43,6 @@ gopts.opt('port', short='p', val='portnu
fn=set_int, default=0,
use="Use specified port for migration.")
-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)
@@ -65,11 +61,9 @@ def main(argv):
vm_ref = get_single_vm(dom)
other_config = {
"port": opts.vals.port,
- "resource": opts.vals.resource
}
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)
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
|
Home