summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorPatrick Ohly <patrick.ohly@intel.com>2017-03-27 15:03:23 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-28 08:41:08 +0100
commitd5421dd00b9cf785fa77e77c6c739e8bd8822fa3 (patch)
treee08f4f8e452625676a995cc8d78930dec6dd0332 /meta
parent44fe106baf5fd5aebe26c5f28004e2b18d839b7c (diff)
downloadopenembedded-core-d5421dd00b9cf785fa77e77c6c739e8bd8822fa3.tar.gz
openembedded-core-d5421dd00b9cf785fa77e77c6c739e8bd8822fa3.tar.bz2
openembedded-core-d5421dd00b9cf785fa77e77c6c739e8bd8822fa3.zip
oeqa: QEMU_USE_KVM can list machines
Previously, QEMU_USE_KVM=True enabled the use of kvm only when "x86" was in the MACHINE name. That is too limiting, because for example intel-corei7-64 can also use kvm but it wasn't possible to enable that without changing OE-core. That traditional usage is still supported. In addition, QEMU_USE_KVM can be set to a list of space-separated MACHINE names for which kvm is to be enabled. Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/testimage.bbclass4
-rw-r--r--meta/lib/oeqa/targetcontrol.py7
2 files changed, 7 insertions, 4 deletions
diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass
index bfe5714454..a259423c22 100644
--- a/meta/classes/testimage.bbclass
+++ b/meta/classes/testimage.bbclass
@@ -210,7 +210,9 @@ def testimage_main(d):
# Get use_kvm
qemu_use_kvm = d.getVar("QEMU_USE_KVM")
- if qemu_use_kvm and qemu_use_kvm == 'True' and 'x86' in machine:
+ if qemu_use_kvm and \
+ (qemu_use_kvm == 'True' and 'x86' in machine or \
+ d.getVar('MACHINE') in qemu_use_kvm.split()):
kvm = True
else:
kvm = False
diff --git a/meta/lib/oeqa/targetcontrol.py b/meta/lib/oeqa/targetcontrol.py
index 40a2589cc9..c3aeb221dd 100644
--- a/meta/lib/oeqa/targetcontrol.py
+++ b/meta/lib/oeqa/targetcontrol.py
@@ -131,9 +131,10 @@ class QemuTarget(BaseTarget):
dump_target_cmds = d.getVar("testimage_dump_target")
dump_host_cmds = d.getVar("testimage_dump_host")
dump_dir = d.getVar("TESTIMAGE_DUMP_DIR")
- if d.getVar("QEMU_USE_KVM", False) is not None \
- and d.getVar("QEMU_USE_KVM", False) == "True" \
- and "x86" in d.getVar("MACHINE"):
+ qemu_use_kvm = d.getVar("QEMU_USE_KVM")
+ if qemu_use_kvm and \
+ (qemu_use_kvm == "True" and "x86" in d.getVar("MACHINE") or \
+ d.getVar("MACHINE") in qemu_use_kvm.split()):
use_kvm = True
else:
use_kvm = False