We want QEMU_USE_KVM to only set to some boolean value, with possible
MACHINE override. Drop the support of listing machines in this variable,
and give users error message if they still do so.
Error message below is an example.
ERROR: core-image-minimal-1.0-r0 do_testimage: Invalid boolean value
'intel-corei7-64 intel-core2-32 qemux86 qemux86-64'
QEMU_USE_KVM needs to be set to a boolean value. It no longer supports
accepting a list of machines.
e.g.
QEMU_USE_KVM_qemux86-64 = '1'
ERROR: core-image-minimal-1.0-r0 do_testimage: Function failed: do_testimage
QB_CPU_KVM is also checked to determine whether to enable kvm.
Signed-off-by: Chen Qi <qi.c...@windriver.com>
---
meta/classes/testimage.bbclass | 12 +++++++-----
meta/lib/oeqa/targetcontrol.py | 12 +++++++-----
2 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass
index 82cbb06..3353d133 100644
--- a/meta/classes/testimage.bbclass
+++ b/meta/classes/testimage.bbclass
@@ -229,11 +229,13 @@ def testimage_main(d):
# Get use_kvm
qemu_use_kvm = d.getVar("QEMU_USE_KVM")
- if qemu_use_kvm and \
- (d.getVar('MACHINE') in qemu_use_kvm.split() or \
- oe.types.boolean(qemu_use_kvm) and 'x86' in machine):
- kvm = True
- else:
+ try:
+ kvm = oe.types.boolean(qemu_use_kvm)
+ except ValueError as e:
+ bb.fatal("%s\nQEMU_USE_KVM needs to be set to a boolean value. It no
longer supports accepting a list of machines.\n"
+ " e.g.\n"
+ " QEMU_USE_KVM_qemux86-64 = '1'" % e)
+ if kvm and not d.getVar('QB_CPU_KVM'):
kvm = False
slirp = False
diff --git a/meta/lib/oeqa/targetcontrol.py b/meta/lib/oeqa/targetcontrol.py
index 59a9c35..d21823b 100644
--- a/meta/lib/oeqa/targetcontrol.py
+++ b/meta/lib/oeqa/targetcontrol.py
@@ -108,11 +108,13 @@ class QemuTarget(BaseTarget):
dump_host_cmds = d.getVar("testimage_dump_host")
dump_dir = d.getVar("TESTIMAGE_DUMP_DIR")
qemu_use_kvm = d.getVar("QEMU_USE_KVM")
- if qemu_use_kvm and \
- (oe.types.boolean(qemu_use_kvm) and "x86" in d.getVar("MACHINE") or
\
- d.getVar("MACHINE") in qemu_use_kvm.split()):
- use_kvm = True
- else:
+ try:
+ use_kvm = oe.types.boolean(qemu_use_kvm)
+ except ValueError as e:
+ bb.fatal("%s\nQEMU_USE_KVM needs to be set to a boolean value. It
no longer supports accepting a list of machines.\n"
+ " e.g.\n"
+ " QEMU_USE_KVM_qemux86-64 = '1'" % e)
+ if use_kvm and not d.getVar('QB_CPU_KVM'):
use_kvm = False
# Log QemuRunner log output to a file
--
1.9.1
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
