summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYeoh Ee Peng <ee.peng.yeoh@intel.com>2018-11-22 17:10:43 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-02-25 22:13:06 +0000
commite4990ae01c9f3f486b4b745a2602795e9d496109 (patch)
tree9535baae6aec84017200788cfc6c25db1ede1d28
parent544c56b6950f0598d5eaf62d9ae9d9de5fcb7eaf (diff)
downloadopenembedded-core-contrib-e4990ae01c9f3f486b4b745a2602795e9d496109.tar.gz
openembedded-core-contrib-e4990ae01c9f3f486b4b745a2602795e9d496109.tar.bz2
openembedded-core-contrib-e4990ae01c9f3f486b4b745a2602795e9d496109.zip
oeqa/qemu & runtime: qemu do not need ip input from external
Qemu do not use the ip input from external. It will retrieve ip from QemuRunner instance and assign ip value. (From OE-Core rev: 14d99dc6c39c963ba3e0d9a30274846bd5369210) Signed-off-by: Yeoh Ee Peng <ee.peng.yeoh@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta/lib/oeqa/core/target/qemu.py5
-rw-r--r--meta/lib/oeqa/runtime/context.py2
2 files changed, 3 insertions, 4 deletions
diff --git a/meta/lib/oeqa/core/target/qemu.py b/meta/lib/oeqa/core/target/qemu.py
index bf3b633f04..538bf12b6a 100644
--- a/meta/lib/oeqa/core/target/qemu.py
+++ b/meta/lib/oeqa/core/target/qemu.py
@@ -12,15 +12,14 @@ from oeqa.utils.qemurunner import QemuRunner
supported_fstypes = ['ext3', 'ext4', 'cpio.gz', 'wic']
class OEQemuTarget(OESSHTarget):
- def __init__(self, logger, ip, server_ip, timeout=300, user='root',
+ def __init__(self, logger, server_ip, timeout=300, user='root',
port=None, machine='', rootfs='', kernel='', kvm=False,
dump_dir='', dump_host_cmds='', display='', bootlog='',
tmpdir='', dir_image='', boottime=60, **kwargs):
- super(OEQemuTarget, self).__init__(logger, ip, server_ip, timeout,
+ super(OEQemuTarget, self).__init__(logger, None, server_ip, timeout,
user, port)
- self.ip = ip
self.server_ip = server_ip
self.machine = machine
self.rootfs = rootfs
diff --git a/meta/lib/oeqa/runtime/context.py b/meta/lib/oeqa/runtime/context.py
index f3341b2e33..ffb846aace 100644
--- a/meta/lib/oeqa/runtime/context.py
+++ b/meta/lib/oeqa/runtime/context.py
@@ -98,7 +98,7 @@ class OERuntimeTestContextExecutor(OETestContextExecutor):
if target_type == 'simpleremote':
target = OESSHTarget(logger, target_ip, server_ip, **kwargs)
elif target_type == 'qemu':
- target = OEQemuTarget(logger, target_ip, server_ip, **kwargs)
+ target = OEQemuTarget(logger, server_ip, **kwargs)
else:
# XXX: This code uses the old naming convention for controllers and
# targets, the idea it is to leave just targets as the controller