summaryrefslogtreecommitdiffstats
path: root/meta/lib/oeqa/targetcontrol.py
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/lib/oeqa/targetcontrol.py
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/lib/oeqa/targetcontrol.py')
-rw-r--r--meta/lib/oeqa/targetcontrol.py8
1 files changed, 1 insertions, 7 deletions
diff --git a/meta/lib/oeqa/targetcontrol.py b/meta/lib/oeqa/targetcontrol.py
index 02ea1c037c..97d67adbde 100644
--- a/meta/lib/oeqa/targetcontrol.py
+++ b/meta/lib/oeqa/targetcontrol.py
@@ -107,13 +107,7 @@ class QemuTarget(BaseTarget):
107 dump_target_cmds = d.getVar("testimage_dump_target") 107 dump_target_cmds = d.getVar("testimage_dump_target")
108 dump_host_cmds = d.getVar("testimage_dump_host") 108 dump_host_cmds = d.getVar("testimage_dump_host")
109 dump_dir = d.getVar("TESTIMAGE_DUMP_DIR") 109 dump_dir = d.getVar("TESTIMAGE_DUMP_DIR")
110 qemu_use_kvm = d.getVar("QEMU_USE_KVM") 110 use_kvm = oe.types.qemu_use_kvm(d.getVar('QEMU_USE_KVM'), d.getVar('TARGET_ARCH'))
111 if qemu_use_kvm and \
112 (oe.types.boolean(qemu_use_kvm) and "x86" in d.getVar("MACHINE") or \
113 d.getVar("MACHINE") in qemu_use_kvm.split()):
114 use_kvm = True
115 else:
116 use_kvm = False
117 111
118 # Log QemuRunner log output to a file 112 # Log QemuRunner log output to a file
119 import oe.path 113 import oe.path