mirror of
https://git.yoctoproject.org/poky
synced 2026-06-01 13:09:50 +00:00
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) (From OE-Core rev: e4990ae01c9f3f486b4b745a2602795e9d496109) 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> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
e1b97539c8
commit
3c7d4f0526
@@ -12,15 +12,14 @@ from oeqa.utils.qemurunner import QemuRunner
|
|||||||
supported_fstypes = ['ext3', 'ext4', 'cpio.gz', 'wic']
|
supported_fstypes = ['ext3', 'ext4', 'cpio.gz', 'wic']
|
||||||
|
|
||||||
class OEQemuTarget(OESSHTarget):
|
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,
|
port=None, machine='', rootfs='', kernel='', kvm=False,
|
||||||
dump_dir='', dump_host_cmds='', display='', bootlog='',
|
dump_dir='', dump_host_cmds='', display='', bootlog='',
|
||||||
tmpdir='', dir_image='', boottime=60, **kwargs):
|
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)
|
user, port)
|
||||||
|
|
||||||
self.ip = ip
|
|
||||||
self.server_ip = server_ip
|
self.server_ip = server_ip
|
||||||
self.machine = machine
|
self.machine = machine
|
||||||
self.rootfs = rootfs
|
self.rootfs = rootfs
|
||||||
|
|||||||
@@ -98,7 +98,7 @@ class OERuntimeTestContextExecutor(OETestContextExecutor):
|
|||||||
if target_type == 'simpleremote':
|
if target_type == 'simpleremote':
|
||||||
target = OESSHTarget(logger, target_ip, server_ip, **kwargs)
|
target = OESSHTarget(logger, target_ip, server_ip, **kwargs)
|
||||||
elif target_type == 'qemu':
|
elif target_type == 'qemu':
|
||||||
target = OEQemuTarget(logger, target_ip, server_ip, **kwargs)
|
target = OEQemuTarget(logger, server_ip, **kwargs)
|
||||||
else:
|
else:
|
||||||
# XXX: This code uses the old naming convention for controllers and
|
# XXX: This code uses the old naming convention for controllers and
|
||||||
# targets, the idea it is to leave just targets as the controller
|
# targets, the idea it is to leave just targets as the controller
|
||||||
|
|||||||
Reference in New Issue
Block a user