diff options
Diffstat (limited to 'meta/lib/oeqa/core/target/qemu.py')
-rw-r--r-- | meta/lib/oeqa/core/target/qemu.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/meta/lib/oeqa/core/target/qemu.py b/meta/lib/oeqa/core/target/qemu.py index 008a9f03ce..059106e915 100644 --- a/meta/lib/oeqa/core/target/qemu.py +++ b/meta/lib/oeqa/core/target/qemu.py | |||
@@ -8,6 +8,7 @@ import os | |||
8 | import sys | 8 | import sys |
9 | import signal | 9 | import signal |
10 | import time | 10 | import time |
11 | from collections import defaultdict | ||
11 | 12 | ||
12 | from .ssh import OESSHTarget | 13 | from .ssh import OESSHTarget |
13 | from oeqa.utils.qemurunner import QemuRunner | 14 | from oeqa.utils.qemurunner import QemuRunner |
@@ -18,7 +19,8 @@ class OEQemuTarget(OESSHTarget): | |||
18 | def __init__(self, logger, server_ip, timeout=300, user='root', | 19 | def __init__(self, logger, server_ip, timeout=300, user='root', |
19 | port=None, machine='', rootfs='', kernel='', kvm=False, slirp=False, | 20 | port=None, machine='', rootfs='', kernel='', kvm=False, slirp=False, |
20 | dump_dir='', dump_host_cmds='', display='', bootlog='', | 21 | dump_dir='', dump_host_cmds='', display='', bootlog='', |
21 | tmpdir='', dir_image='', boottime=60, serial_ports=2, **kwargs): | 22 | tmpdir='', dir_image='', boottime=60, serial_ports=2, |
23 | boot_patterns = defaultdict(str), **kwargs): | ||
22 | 24 | ||
23 | super(OEQemuTarget, self).__init__(logger, None, server_ip, timeout, | 25 | super(OEQemuTarget, self).__init__(logger, None, server_ip, timeout, |
24 | user, port) | 26 | user, port) |
@@ -30,13 +32,14 @@ class OEQemuTarget(OESSHTarget): | |||
30 | self.kernel = kernel | 32 | self.kernel = kernel |
31 | self.kvm = kvm | 33 | self.kvm = kvm |
32 | self.use_slirp = slirp | 34 | self.use_slirp = slirp |
35 | self.boot_patterns = boot_patterns | ||
33 | 36 | ||
34 | self.runner = QemuRunner(machine=machine, rootfs=rootfs, tmpdir=tmpdir, | 37 | self.runner = QemuRunner(machine=machine, rootfs=rootfs, tmpdir=tmpdir, |
35 | deploy_dir_image=dir_image, display=display, | 38 | deploy_dir_image=dir_image, display=display, |
36 | logfile=bootlog, boottime=boottime, | 39 | logfile=bootlog, boottime=boottime, |
37 | use_kvm=kvm, use_slirp=slirp, dump_dir=dump_dir, | 40 | use_kvm=kvm, use_slirp=slirp, dump_dir=dump_dir, |
38 | dump_host_cmds=dump_host_cmds, logger=logger, | 41 | dump_host_cmds=dump_host_cmds, logger=logger, |
39 | serial_ports=serial_ports) | 42 | serial_ports=serial_ports, boot_patterns = boot_patterns) |
40 | 43 | ||
41 | def start(self, params=None, extra_bootparams=None, runqemuparams=''): | 44 | def start(self, params=None, extra_bootparams=None, runqemuparams=''): |
42 | if self.use_slirp and not self.server_ip: | 45 | if self.use_slirp and not self.server_ip: |