From: Chen Qi Date: Fri, 24 Mar 2017 08:45:00 +0000 (-0700) Subject: qemurunner.py: fix handling of runqemuparams X-Git-Tag: uninative-1.6~23 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=16400f2b8bffc4cae0263bb597522071299b46ca;p=openembedded-core.git qemurunner.py: fix handling of runqemuparams The launch() doesn't need runqemuparams, we need handle it in start(). Signed-off-by: Chen Qi Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py index c292b759bc..95f59257ca 100644 --- a/meta/lib/oeqa/utils/qemurunner.py +++ b/meta/lib/oeqa/utils/qemurunner.py @@ -118,7 +118,7 @@ class QemuRunner: os.environ["DEPLOY_DIR_IMAGE"] = self.deploy_dir_image if not launch_cmd: - launch_cmd = 'runqemu snapshot' + launch_cmd = 'runqemu snapshot %s' % runqemuparams if self.use_kvm: logger.info('Using kvm for runqemu') launch_cmd += ' kvm' @@ -128,9 +128,9 @@ class QemuRunner: launch_cmd += ' nographic' launch_cmd += ' %s %s' % (self.machine, self.rootfs) - return self.launch(launch_cmd, qemuparams=qemuparams, get_ip=get_ip, extra_bootparams=extra_bootparams, runqemuparams=runqemuparams) + return self.launch(launch_cmd, qemuparams=qemuparams, get_ip=get_ip, extra_bootparams=extra_bootparams) - def launch(self, launch_cmd, get_ip = True, qemuparams = None, extra_bootparams = None, runqemuparams=''): + def launch(self, launch_cmd, get_ip = True, qemuparams = None, extra_bootparams = None): try: threadsock, threadport = self.create_socket() self.server_socket, self.serverport = self.create_socket()