aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2017-03-24 01:45:00 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-26 13:17:01 +0100
commit16400f2b8bffc4cae0263bb597522071299b46ca (patch)
tree71e15ec70f56991f0a88b12bd53ee267461abe07
parent9305d816bdf8837ea3a407091cb7f24a9a3ae8dc (diff)
downloadopenembedded-core-contrib-16400f2b8bffc4cae0263bb597522071299b46ca.tar.gz
qemurunner.py: fix handling of runqemuparams
The launch() doesn't need runqemuparams, we need handle it in start(). Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oeqa/utils/qemurunner.py6
1 files changed, 3 insertions, 3 deletions
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()