diff options
author | Patrick Ohly <patrick.ohly@intel.com> | 2017-03-27 15:03:23 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-28 08:43:13 +0100 |
commit | 759fcd204f9594b078b4ceebcdb2049793f7a288 (patch) | |
tree | 3d246431a95c816a1b80d358fadcf706e0654593 /meta | |
parent | 7f6b1cd2c1f5090d1f46995e769bae5d1b947327 (diff) | |
download | poky-759fcd204f9594b078b4ceebcdb2049793f7a288.tar.gz |
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.
(From OE-Core rev: d5421dd00b9cf785fa77e77c6c739e8bd8822fa3)
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.bbclass | 4 | ||||
-rw-r--r-- | meta/lib/oeqa/targetcontrol.py | 7 |
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): | |||
210 | 210 | ||
211 | # Get use_kvm | 211 | # Get use_kvm |
212 | qemu_use_kvm = d.getVar("QEMU_USE_KVM") | 212 | qemu_use_kvm = d.getVar("QEMU_USE_KVM") |
213 | if qemu_use_kvm and qemu_use_kvm == 'True' and 'x86' in machine: | 213 | if qemu_use_kvm and \ |
214 | (qemu_use_kvm == 'True' and 'x86' in machine or \ | ||
215 | d.getVar('MACHINE') in qemu_use_kvm.split()): | ||
214 | kvm = True | 216 | kvm = True |
215 | else: | 217 | else: |
216 | kvm = False | 218 | 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): | |||
131 | dump_target_cmds = d.getVar("testimage_dump_target") | 131 | dump_target_cmds = d.getVar("testimage_dump_target") |
132 | dump_host_cmds = d.getVar("testimage_dump_host") | 132 | dump_host_cmds = d.getVar("testimage_dump_host") |
133 | dump_dir = d.getVar("TESTIMAGE_DUMP_DIR") | 133 | dump_dir = d.getVar("TESTIMAGE_DUMP_DIR") |
134 | if d.getVar("QEMU_USE_KVM", False) is not None \ | 134 | qemu_use_kvm = d.getVar("QEMU_USE_KVM") |
135 | and d.getVar("QEMU_USE_KVM", False) == "True" \ | 135 | if qemu_use_kvm and \ |
136 | and "x86" in d.getVar("MACHINE"): | 136 | (qemu_use_kvm == "True" and "x86" in d.getVar("MACHINE") or \ |
137 | d.getVar("MACHINE") in qemu_use_kvm.split()): | ||
137 | use_kvm = True | 138 | use_kvm = True |
138 | else: | 139 | else: |
139 | use_kvm = False | 140 | use_kvm = False |