[OE-core] [PATCH 1/4 v2] oeqa/qemu & runtime: qemu do not need ip input from external
Yeoh Ee Peng
ee.peng.yeoh at intel.com
Thu Nov 22 09:10:43 UTC 2018
Qemu do not use the ip input from external. It will
retrieve ip from QemuRunner instance and assign
ip value.
Signed-off-by: Yeoh Ee Peng <ee.peng.yeoh at intel.com>
---
meta/lib/oeqa/core/target/qemu.py | 5 ++---
meta/lib/oeqa/runtime/context.py | 2 +-
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 bf3b633..538bf12 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 a7f3823..943e29b 100644
--- a/meta/lib/oeqa/runtime/context.py
+++ b/meta/lib/oeqa/runtime/context.py
@@ -101,7 +101,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
--
2.7.4
More information about the Openembedded-core
mailing list