[oe-commits] [openembedded-core] 08/49: testimage.bbclass: fix qemu_use_kvm handling

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch sumo
in repository openembedded-core.

commit 3383b1f9bb4aedfb88e888e88fe316e3f361c7bf
Author: Emmanuel Roullit <emmanuel.roullit at gmail.com>
AuthorDate: Wed Sep 5 21:49:58 2018 +0200

    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)
    
    Signed-off-by: Emmanuel Roullit <emmanuel.roullit at gmail.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/classes/testimage.bbclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass
index 3e4ffca..11c2dda 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

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.