summaryrefslogtreecommitdiffstats
path: root/meta/classes
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-02-06 16:38:30 +0000
commit6b6b442f3e7091f4b1314766cf2d3a9919df07bd (patch)
treeaaccdde0d62bf597a8f52eb03e95b968009dcf70 /meta/classes
parente82e4d2cb05dcbafb70af3ecfd89897bf16f983c (diff)
downloadpoky-6b6b442f3e7091f4b1314766cf2d3a9919df07bd.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) (From OE-Core rev: 2c12e1d9c262fb7e5fe02ae2d092789d6536413f) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-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 f2ff91da9d..614df87d02 100644
--- a/meta/classes/testimage.bbclass
+++ b/meta/classes/testimage.bbclass
@@ -248,13 +248,7 @@ def testimage_main(d):
248 boottime = int(d.getVar("TEST_QEMUBOOT_TIMEOUT")) 248 boottime = int(d.getVar("TEST_QEMUBOOT_TIMEOUT"))
249 249
250 # Get use_kvm 250 # Get use_kvm
251 qemu_use_kvm = d.getVar("QEMU_USE_KVM") 251 kvm = oe.types.qemu_use_kvm(d.getVar('QEMU_USE_KVM'), d.getVar('TARGET_ARCH'))
252 if qemu_use_kvm and \
253 (d.getVar('MACHINE') in qemu_use_kvm.split() or \
254 oe.types.boolean(qemu_use_kvm) and 'x86' in machine):
255 kvm = True
256 else:
257 kvm = False
258 252
259 # TODO: We use the current implementatin of qemu runner because of 253 # TODO: We use the current implementatin of qemu runner because of
260 # time constrains, qemu runner really needs a refactor too. 254 # time constrains, qemu runner really needs a refactor too.