From 7e34a52d1babbb4c316fa73f40e42b26899f5121 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Tue, 20 Nov 2012 17:17:40 +0000 Subject: 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 Acked-by: Ian Jackson Committed-by: Ian Campbell --- tools/python/xen/xend/XendOptions.py | 4 ++++ tools/python/xen/xend/tests/xend-config.sxp | 2 ++ 2 files changed, 6 insertions(+) (limited to 'tools/python') 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 '') -- cgit v1.2.3