From 185f6a7fd8361a74f375c83daec0cb4037e3dd73 Mon Sep 17 00:00:00 2001 From: Emmanuel Roullit Date: Wed, 5 Sep 2018 21:49:58 +0200 Subject: testimage.bbclass: fix qemu_use_kvm handling QEMU_USE_KVM can either be a boolean or a whitespace separated list of kvm supported machines. For the 'intel-corei7-64' machine, defined in meta-intel, kvm could not be used as the 'x86' substring is not part of its machine name. By changing the order of this 'or' statement and setting the 'QEMU_USE_KVM' variable to 'intel-corei7-64', it is possible to run the 'testimage' task with kvm support successfully. (From OE-Core rev: a22789253aa653dc50fb159b40910248c2f98dd4) (From OE-Core rev: 3383b1f9bb4aedfb88e888e88fe316e3f361c7bf) Signed-off-by: Emmanuel Roullit Signed-off-by: Richard Purdie --- meta/classes/testimage.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta/classes') diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass index 3e4ffcaca8..11c2ddab98 100644 --- a/meta/classes/testimage.bbclass +++ b/meta/classes/testimage.bbclass @@ -240,8 +240,8 @@ def testimage_main(d): # Get use_kvm qemu_use_kvm = d.getVar("QEMU_USE_KVM") if qemu_use_kvm and \ - (oe.types.boolean(qemu_use_kvm) and 'x86' in machine or \ - d.getVar('MACHINE') in qemu_use_kvm.split()): + (d.getVar('MACHINE') in qemu_use_kvm.split() or \ + oe.types.boolean(qemu_use_kvm) and 'x86' in machine): kvm = True else: kvm = False -- cgit v1.2.3-54-g00ecf