aboutsummaryrefslogtreecommitdiffstats
path: root/tools/python
diff options
context:
space:
mode:
authorIan Campbell <Ian.Campbell@citrix.com>2012-11-20 17:17:40 +0000
committerIan Campbell <Ian.Campbell@citrix.com>2012-11-20 17:17:40 +0000
commit7e34a52d1babbb4c316fa73f40e42b26899f5121 (patch)
tree9b1ab61f919a65c7d5b4cce27833afdb2cbfc967 /tools/python
parent2cb5154f089c67003268c54f608169ab7c9e8d39 (diff)
downloadxen-7e34a52d1babbb4c316fa73f40e42b26899f5121.tar.gz
xen-7e34a52d1babbb4c316fa73f40e42b26899f5121.tar.bz2
xen-7e34a52d1babbb4c316fa73f40e42b26899f5121.zip
xend: reinstate XendOptionsFile.get_external_migration_tool
This was removed by 26167:31dcc0e08754 "xend: Remove old vtpm support from xm" but at least one caller was left. Reinstate with s/TPM/device/ since it appears that this functionality could apply elsewhere. Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> Committed-by: Ian Campbell <ian.campbell@citrix.com>
Diffstat (limited to 'tools/python')
-rw-r--r--tools/python/xen/xend/XendOptions.py4
-rw-r--r--tools/python/xen/xend/tests/xend-config.sxp2
2 files changed, 6 insertions, 0 deletions
diff --git a/tools/python/xen/xend/XendOptions.py b/tools/python/xen/xend/XendOptions.py
index e2651e328e..cc6f38ed2c 100644
--- a/tools/python/xen/xend/XendOptions.py
+++ b/tools/python/xen/xend/XendOptions.py
@@ -349,6 +349,10 @@ class XendOptions:
else:
return None
+ def get_external_migration_tool(self):
+ """@return the name of the tool to handle virtual device migration."""
+ return self.get_config_string('external-migration-tool', self.external_migration_tool_default)
+
def get_enable_dump(self):
return self.get_config_bool('enable-dump', 'no')
diff --git a/tools/python/xen/xend/tests/xend-config.sxp b/tools/python/xen/xend/tests/xend-config.sxp
index 9f26e3419b..8f9ec5b8e0 100644
--- a/tools/python/xen/xend/tests/xend-config.sxp
+++ b/tools/python/xen/xend/tests/xend-config.sxp
@@ -127,3 +127,5 @@
# Whether to enable core-dumps when domains crash.
#(enable-dump no)
+# The tool used for initiating virtual device migration
+#(external-migration-tool '')