summaryrefslogtreecommitdiffstats
path: root/meta/classes/testimage.bbclass
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2019-01-04 15:15:43 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-01-08 11:16:44 +0000
commitdda8084d7a801c28a26e05507736861462dca508 (patch)
tree0cb6f7f6d87603d48540ddab5d43203e581678fa /meta/classes/testimage.bbclass
parent6464cb55f0b1506aa16e9ae5a4dbdc838ca379de (diff)
downloadpoky-dda8084d7a801c28a26e05507736861462dca508.tar.gz
oeqa: Fix for QEMU_USE_KVM
Fixed: MACHINE = "qemux86" QEMU_USE_KVM = "qemux86" IMAGE_CLASSES += "testimage" $ oe-selftest -r runqemu.RunqemuTests.test_boot_rootfs [snip] File "/buildarea1/lyang1/poky/meta/lib/oe/types.py", line 122, in boolean raise ValueError("Invalid boolean value '%s'" % value) ValueError: Invalid boolean value 'qemux86' Now QEMU_USE_KVM can only be boolean, can not contain MACHINE any more, kvm will be enabled if target_arch == build_arch or both of them are x86 archs. (From OE-Core rev: 7c1a8a624cad8d967635c6cb5f99cf655bde3d44) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/testimage.bbclass')
-rw-r--r--meta/classes/testimage.bbclass8
1 files changed, 1 insertions, 7 deletions
diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass
index 3c2209af91..73cd375dcb 100644
--- a/meta/classes/testimage.bbclass
+++ b/meta/classes/testimage.bbclass
@@ -231,13 +231,7 @@ def testimage_main(d):
231 boottime = int(d.getVar("TEST_QEMUBOOT_TIMEOUT")) 231 boottime = int(d.getVar("TEST_QEMUBOOT_TIMEOUT"))
232 232
233 # Get use_kvm 233 # Get use_kvm
234 qemu_use_kvm = d.getVar("QEMU_USE_KVM") 234 kvm = oe.types.qemu_use_kvm(d.getVar('QEMU_USE_KVM'), d.getVar('TARGET_ARCH'))
235 if qemu_use_kvm and \
236 (d.getVar('MACHINE') in qemu_use_kvm.split() or \
237 oe.types.boolean(qemu_use_kvm) and 'x86' in machine):
238 kvm = True
239 else:
240 kvm = False
241 235
242 slirp = False 236 slirp = False
243 if d.getVar("QEMU_USE_SLIRP"): 237 if d.getVar("QEMU_USE_SLIRP"):