diff options
-rw-r--r-- | conf/machine/acrn.conf | 9 | ||||
-rw-r--r-- | lib/oeqa/controllers/zephyrtargetcontrol.py | 6 | ||||
-rw-r--r-- | lib/oeqa/utils/qemuzephyrrunner.py | 8 |
3 files changed, 9 insertions, 14 deletions
diff --git a/conf/machine/acrn.conf b/conf/machine/acrn.conf deleted file mode 100644 index c044933..0000000 --- a/conf/machine/acrn.conf +++ /dev/null @@ -1,9 +0,0 @@ -#@TYPE: Machine -#@NAME: acrn -#@DESCRIPTION: Machine for Zephyr BOARD acrn - -require conf/machine/include/qemu.inc -require conf/machine/include/tune-corei7-common.inc -ZEPHYR_INHERIT_CLASSES += "zephyr-qemuboot" - -ARCH_acrn = "x86" diff --git a/lib/oeqa/controllers/zephyrtargetcontrol.py b/lib/oeqa/controllers/zephyrtargetcontrol.py index 8e94cb5..1dd7fd2 100644 --- a/lib/oeqa/controllers/zephyrtargetcontrol.py +++ b/lib/oeqa/controllers/zephyrtargetcontrol.py @@ -14,8 +14,8 @@ class QemuTargetZephyr(OETarget): def __init__(self, logger, ip, server_ip, machine='', rootfs='', tmpdir ='',dir_image ='',display=None, kernel='',boottime=60,bootlog='',kvm=False,slirp=False, - dump_dir='',serial_ports=0,ovmf=None,target_modules_path='',powercontrol_cmd='',powercontrol_extra_args='', - serialcontrol_cmd=None,serialcontrol_extra_args='',testimage_dump_target='' ): + dump_dir='',serial_ports=0,ovmf=None,tmpfsdir='' ,target_modules_path='',powercontrol_cmd='',powercontrol_extra_args='', + serialcontrol_cmd=None,serialcontrol_extra_args='',testimage_dump_target=''): timeout = 300 user = 'root' @@ -48,7 +48,7 @@ class QemuTargetZephyr(OETarget): logfile=self.qemulog, boottime=boottime, use_kvm=kvm, dump_dir=dump_dir, dump_host_cmds=dump_host_cmds, - logger = logger) + logger = logger, tmpfsdir=tmpfsdir) def start(self, params=None, runqemuparams=None, extra_bootparams=None): diff --git a/lib/oeqa/utils/qemuzephyrrunner.py b/lib/oeqa/utils/qemuzephyrrunner.py index 0308f1e..e8a1bd4 100644 --- a/lib/oeqa/utils/qemuzephyrrunner.py +++ b/lib/oeqa/utils/qemuzephyrrunner.py @@ -18,11 +18,12 @@ from oeqa.utils.qemurunner import QemuRunner class QemuZephyrRunner(QemuRunner): - def __init__(self, machine, rootfs, display, tmpdir, deploy_dir_image, logfile, boottime, dump_dir, dump_host_cmds, use_kvm, logger): + def __init__(self, machine, rootfs, display, tmpdir, deploy_dir_image, logfile, boottime, dump_dir, dump_host_cmds, use_kvm, logger, tmpfsdir): + QemuRunner.__init__(self, machine, rootfs, display, tmpdir, deploy_dir_image, logfile, boottime, None, - None, use_kvm, logger) + None, use_kvm, logger, tmpfsdir) # Popen object for runqemu self.socketfile = tempfile.NamedTemporaryFile() @@ -32,6 +33,7 @@ class QemuZephyrRunner(QemuRunner): self.kernel = rootfs self.deploy_dir_image = deploy_dir_image + self.tmpfsdir = tmpfsdir self.logfile = logfile self.use_kvm = use_kvm @@ -73,6 +75,8 @@ class QemuZephyrRunner(QemuRunner): return False else: os.environ["DEPLOY_DIR_IMAGE"] = self.deploy_dir_image + if self.tmpfsdir: + env["RUNQEMU_TMPFS_DIR"] = self.tmpfsdir if not os.path.exists(self.kernel): bb.error("Invalid kernel path: %s" % self.kernel) |