On 03/29/2013 07:06 AM, Mike Qiu wrote:
From: Mike Qiu <[email protected]>
Currently, check_modules in qemu/get_started.py and
virttest/standalone_test.py just suitable for x86_64, for other
arch, especially ppc64, will not have module like kvm-%s, and this
causes errors.
This method of getting the kvm module list could surely be refactored.
I'm taking care of that on the updated patchset.
To fix this problem, use platform to decide the modules need to
be checked.
Signed-off-by: Mike Qiu <[email protected]>
---
qemu/get_started.py | 4 +++-
virttest/base_installer.py | 5 +++--
virttest/standalone_test.py | 3 ++-
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/qemu/get_started.py b/qemu/get_started.py
index 61e3bef..e33f363 100755
--- a/qemu/get_started.py
+++ b/qemu/get_started.py
@@ -13,7 +13,9 @@ test_dir = os.path.dirname(sys.modules[__name__].__file__)
test_dir = os.path.abspath(test_dir)
base_dir = data_dir.get_data_dir()
default_userspace_paths = ["/usr/bin/qemu-kvm", "/usr/bin/qemu-img"]
-check_modules = ["kvm", "kvm-%s" % utils_misc.get_cpu_vendor(verbose=False)]
+platform = utils_misc.get_hardware_platform()
+check_modules = platform == 'ppc64' and ["kvm"] or ["kvm",
+ "kvm-%s" % utils_misc.get_cpu_vendor(verbose=False)]
online_docs_url = "https://github.com/autotest/virt-test/wiki/GetStarted";
interactive = True
diff --git a/virttest/base_installer.py b/virttest/base_installer.py
index e949285..e6c1192 100644
--- a/virttest/base_installer.py
+++ b/virttest/base_installer.py
@@ -449,8 +449,9 @@ class NoopInstaller(BaseInstaller):
@param params: Dict with test params.
'''
if params['vm_type'] == 'qemu':
- params['module_list'] = ("kvm kvm-%s" %
- utils_misc.get_cpu_vendor(verbose=False))
+ platform = utils_misc.get_hardware_platform()
+ params['module_list'] = platform == 'ppc64' and "kvm" or ("kvm " +
+ "kvm-%s" % utils_misc.get_cpu_vendor(verbose=False))
super(NoopInstaller, self).__init__(mode, name, test, params)
diff --git a/virttest/standalone_test.py b/virttest/standalone_test.py
index deab9e6..8409668 100644
--- a/virttest/standalone_test.py
+++ b/virttest/standalone_test.py
@@ -568,7 +568,8 @@ def bootstrap_tests(options):
test_dir = os.path.abspath(parent_config_dir)
if options.type == 'qemu':
- check_modules = ["kvm",
+ platform = utils_misc.get_hardware_platform()
+ check_modules = platform == 'ppc64' and ["kvm"] or ["kvm",
"kvm-%s" % utils_misc.get_cpu_vendor(verbose=False)]
else:
check_modules = None
_______________________________________________
Virt-test-devel mailing list
[email protected]
https://www.redhat.com/mailman/listinfo/virt-test-devel
