summaryrefslogtreecommitdiffstats
path: root/meta/lib/oeqa/core/target
diff options
context:
space:
mode:
authorKonrad Weihmann <kweihmann@outlook.com>2020-04-14 21:19:14 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-07-02 16:12:36 +0100
commit21b666b47b95f2962921243ee054b77f37bffb23 (patch)
tree460e2990fbb04746eec3f97f5cc1f5199eb574ad /meta/lib/oeqa/core/target
parent81c46e46a8f3db9659fef58d6bd1ce0e45f4ff95 (diff)
downloadpoky-21b666b47b95f2962921243ee054b77f37bffb23.tar.gz
testimage: enable ovmf support
Add support for running wic images with EFI as testimage. Introduces a variable called QEMU_USE_OVMF for configuration. (From OE-Core rev: 458a860b45c0fb5bb3162b5a112b518c3339c1dd) Signed-off-by: Konrad Weihmann <kweihmann@outlook.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 3af8aaff68ed332d812ea7dc184d392700ad7882) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa/core/target')
-rw-r--r--meta/lib/oeqa/core/target/qemu.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/lib/oeqa/core/target/qemu.py b/meta/lib/oeqa/core/target/qemu.py
index 059106e915..295e8765e9 100644
--- a/meta/lib/oeqa/core/target/qemu.py
+++ b/meta/lib/oeqa/core/target/qemu.py
@@ -20,7 +20,7 @@ class OEQemuTarget(OESSHTarget):
20 port=None, machine='', rootfs='', kernel='', kvm=False, slirp=False, 20 port=None, machine='', rootfs='', kernel='', kvm=False, slirp=False,
21 dump_dir='', dump_host_cmds='', display='', bootlog='', 21 dump_dir='', dump_host_cmds='', display='', bootlog='',
22 tmpdir='', dir_image='', boottime=60, serial_ports=2, 22 tmpdir='', dir_image='', boottime=60, serial_ports=2,
23 boot_patterns = defaultdict(str), **kwargs): 23 boot_patterns = defaultdict(str), ovmf=False, **kwargs):
24 24
25 super(OEQemuTarget, self).__init__(logger, None, server_ip, timeout, 25 super(OEQemuTarget, self).__init__(logger, None, server_ip, timeout,
26 user, port) 26 user, port)
@@ -31,6 +31,7 @@ class OEQemuTarget(OESSHTarget):
31 self.rootfs = rootfs 31 self.rootfs = rootfs
32 self.kernel = kernel 32 self.kernel = kernel
33 self.kvm = kvm 33 self.kvm = kvm
34 self.ovmf = ovmf
34 self.use_slirp = slirp 35 self.use_slirp = slirp
35 self.boot_patterns = boot_patterns 36 self.boot_patterns = boot_patterns
36 37
@@ -39,7 +40,8 @@ class OEQemuTarget(OESSHTarget):
39 logfile=bootlog, boottime=boottime, 40 logfile=bootlog, boottime=boottime,
40 use_kvm=kvm, use_slirp=slirp, dump_dir=dump_dir, 41 use_kvm=kvm, use_slirp=slirp, dump_dir=dump_dir,
41 dump_host_cmds=dump_host_cmds, logger=logger, 42 dump_host_cmds=dump_host_cmds, logger=logger,
42 serial_ports=serial_ports, boot_patterns = boot_patterns) 43 serial_ports=serial_ports, boot_patterns = boot_patterns,
44 use_ovmf=ovmf)
43 45
44 def start(self, params=None, extra_bootparams=None, runqemuparams=''): 46 def start(self, params=None, extra_bootparams=None, runqemuparams=''):
45 if self.use_slirp and not self.server_ip: 47 if self.use_slirp and not self.server_ip: