tests/vm: Do not abuse parallelism when KVM is not available

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20181013004034.6968-3-f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Fam Zheng <famz@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2018-10-13 02:40:27 +02:00 committed by Fam Zheng
parent b59b82eded
commit 8a6e007e78

View File

@ -196,6 +196,13 @@ class BaseVM(object):
return self._guest.qmp(*args, **kwargs) return self._guest.qmp(*args, **kwargs)
def parse_args(vm_name): def parse_args(vm_name):
def get_default_jobs():
if kvm_available():
return multiprocessing.cpu_count() / 2
else:
return 1
parser = optparse.OptionParser( parser = optparse.OptionParser(
description="VM test utility. Exit codes: " description="VM test utility. Exit codes: "
"0 = success, " "0 = success, "
@ -208,7 +215,7 @@ def parse_args(vm_name):
help="image file name") help="image file name")
parser.add_option("--force", "-f", action="store_true", parser.add_option("--force", "-f", action="store_true",
help="force build image even if image exists") help="force build image even if image exists")
parser.add_option("--jobs", type=int, default=multiprocessing.cpu_count() / 2, parser.add_option("--jobs", type=int, default=get_default_jobs(),
help="number of virtual CPUs") help="number of virtual CPUs")
parser.add_option("--verbose", "-V", action="store_true", parser.add_option("--verbose", "-V", action="store_true",
help="Pass V=1 to builds within the guest") help="Pass V=1 to builds within the guest")