diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2019-01-04 15:15:43 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-02-25 22:27:45 +0000 |
commit | 122d638e2296fc1654e116229a2432e04b1a6e01 (patch) | |
tree | b7720b1671037a4c6d2f811005d21bfa60deca28 /meta/classes | |
parent | 71bcf6c051f559fd9910b5037f4728ae0c10c773 (diff) | |
download | poky-122d638e2296fc1654e116229a2432e04b1a6e01.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: de1b80f7f7b787f6b5b62c576ca6c62d2440031c)
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.bbclass | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass index 11c2ddab98..b3ae54d6a4 100644 --- a/meta/classes/testimage.bbclass +++ b/meta/classes/testimage.bbclass | |||
@@ -238,13 +238,7 @@ def testimage_main(d): | |||
238 | boottime = int(d.getVar("TEST_QEMUBOOT_TIMEOUT")) | 238 | boottime = int(d.getVar("TEST_QEMUBOOT_TIMEOUT")) |
239 | 239 | ||
240 | # Get use_kvm | 240 | # Get use_kvm |
241 | qemu_use_kvm = d.getVar("QEMU_USE_KVM") | 241 | kvm = oe.types.qemu_use_kvm(d.getVar('QEMU_USE_KVM'), d.getVar('TARGET_ARCH')) |
242 | if qemu_use_kvm and \ | ||
243 | (d.getVar('MACHINE') in qemu_use_kvm.split() or \ | ||
244 | oe.types.boolean(qemu_use_kvm) and 'x86' in machine): | ||
245 | kvm = True | ||
246 | else: | ||
247 | kvm = False | ||
248 | 242 | ||
249 | # TODO: We use the current implementatin of qemu runner because of | 243 | # TODO: We use the current implementatin of qemu runner because of |
250 | # time constrains, qemu runner really needs a refactor too. | 244 | # time constrains, qemu runner really needs a refactor too. |