diff options
| author | Bill Randle <william.c.randle@intel.com> | 2016-08-16 16:08:11 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-08-18 09:27:14 +0100 |
| commit | ebac2c8d1fcd09ebce0659a4abb445e4f1c18571 (patch) | |
| tree | 826ed4d2eff853cd077a047f5394d4eaf52bbb1d /meta | |
| parent | 9d68c024790850cab72ead1e3372a5fcec4ef7b0 (diff) | |
| download | openembedded-core-ebac2c8d1fcd09ebce0659a4abb445e4f1c18571.tar.gz openembedded-core-ebac2c8d1fcd09ebce0659a4abb445e4f1c18571.tar.bz2 openembedded-core-ebac2c8d1fcd09ebce0659a4abb445e4f1c18571.zip | |
testimage: allow using kvm when running qemux86* machines
Using kvm can provide significant speedups when running qemux86* machines
on an x86* host. Enabled by using the new QEMU_USE_KVM variable.
[YOCTO #9298]
Signed-off-by: Bill Randle <william.c.randle@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/lib/oeqa/targetcontrol.py | 7 | ||||
| -rw-r--r-- | meta/lib/oeqa/utils/qemurunner.py | 11 |
2 files changed, 16 insertions, 2 deletions
diff --git a/meta/lib/oeqa/targetcontrol.py b/meta/lib/oeqa/targetcontrol.py index 768c463076..3209ef0430 100644 --- a/meta/lib/oeqa/targetcontrol.py +++ b/meta/lib/oeqa/targetcontrol.py @@ -125,6 +125,12 @@ class QemuTarget(BaseTarget): dump_target_cmds = d.getVar("testimage_dump_target", True) dump_host_cmds = d.getVar("testimage_dump_host", True) dump_dir = d.getVar("TESTIMAGE_DUMP_DIR", True) + if d.getVar("QEMU_USE_KVM", False) is not None \ + and d.getVar("QEMU_USE_KVM", False) == "True" \ + and "x86" in d.getVar("MACHINE", True): + use_kvm = True + else: + use_kvm = False # Log QemuRunner log output to a file import oe.path @@ -153,6 +159,7 @@ class QemuTarget(BaseTarget): display = d.getVar("BB_ORIGENV", False).getVar("DISPLAY", True), logfile = self.qemulog, boottime = int(d.getVar("TEST_QEMUBOOT_TIMEOUT", True)), + use_kvm = use_kvm, dump_dir = dump_dir, dump_host_cmds = d.getVar("testimage_dump_host", True)) diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py index df73120254..69a5ae1eef 100644 --- a/meta/lib/oeqa/utils/qemurunner.py +++ b/meta/lib/oeqa/utils/qemurunner.py @@ -29,7 +29,7 @@ re_control_char = re.compile('[%s]' % re.escape("".join(control_chars))) class QemuRunner: - def __init__(self, machine, rootfs, display, tmpdir, deploy_dir_image, logfile, boottime, dump_dir, dump_host_cmds): + def __init__(self, machine, rootfs, display, tmpdir, deploy_dir_image, logfile, boottime, dump_dir, dump_host_cmds, use_kvm): # Popen object for runqemu self.runqemu = None @@ -49,6 +49,7 @@ class QemuRunner: self.boottime = boottime self.logged = False self.thread = None + self.use_kvm = use_kvm self.runqemutime = 60 self.host_dumper = HostDumper(dump_host_cmds, dump_dir) @@ -133,7 +134,13 @@ class QemuRunner: self.origchldhandler = signal.getsignal(signal.SIGCHLD) signal.signal(signal.SIGCHLD, self.handleSIGCHLD) - launch_cmd = 'runqemu tcpserial=%s %s %s %s' % (self.serverport, self.machine, self.rootfs, self.qemuparams) + launch_cmd = 'runqemu ' + if self.use_kvm: + logger.info('Using kvm for runqemu') + launch_cmd += 'kvm ' + else: + logger.info('Not using kvm for runqemu') + launch_cmd += 'tcpserial=%s %s %s %s' % (self.serverport, self.machine, self.rootfs, self.qemuparams) # FIXME: We pass in stdin=subprocess.PIPE here to work around stty # blocking at the end of the runqemu script when using this within # oe-selftest (this makes stty error out immediately). There ought |