diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2017-03-24 01:45:00 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-27 08:15:06 +0100 |
commit | a5a1d4f4319ec164abf904aeae0753c9bfefcb09 (patch) | |
tree | a67ab5df5c5e1cfeb8b47af575ce591a46109bd9 /meta | |
parent | b742fd023e71320990b26b979dd65632fbd347a2 (diff) | |
download | poky-a5a1d4f4319ec164abf904aeae0753c9bfefcb09.tar.gz |
qemurunner.py: fix handling of runqemuparams
The launch() doesn't need runqemuparams, we need handle it in start().
(From OE-Core rev: 16400f2b8bffc4cae0263bb597522071299b46ca)
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>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/lib/oeqa/utils/qemurunner.py | 6 |
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: | |||
118 | os.environ["DEPLOY_DIR_IMAGE"] = self.deploy_dir_image | 118 | os.environ["DEPLOY_DIR_IMAGE"] = self.deploy_dir_image |
119 | 119 | ||
120 | if not launch_cmd: | 120 | if not launch_cmd: |
121 | launch_cmd = 'runqemu snapshot' | 121 | launch_cmd = 'runqemu snapshot %s' % runqemuparams |
122 | if self.use_kvm: | 122 | if self.use_kvm: |
123 | logger.info('Using kvm for runqemu') | 123 | logger.info('Using kvm for runqemu') |
124 | launch_cmd += ' kvm' | 124 | launch_cmd += ' kvm' |
@@ -128,9 +128,9 @@ class QemuRunner: | |||
128 | launch_cmd += ' nographic' | 128 | launch_cmd += ' nographic' |
129 | launch_cmd += ' %s %s' % (self.machine, self.rootfs) | 129 | launch_cmd += ' %s %s' % (self.machine, self.rootfs) |
130 | 130 | ||
131 | return self.launch(launch_cmd, qemuparams=qemuparams, get_ip=get_ip, extra_bootparams=extra_bootparams, runqemuparams=runqemuparams) | 131 | return self.launch(launch_cmd, qemuparams=qemuparams, get_ip=get_ip, extra_bootparams=extra_bootparams) |
132 | 132 | ||
133 | def launch(self, launch_cmd, get_ip = True, qemuparams = None, extra_bootparams = None, runqemuparams=''): | 133 | def launch(self, launch_cmd, get_ip = True, qemuparams = None, extra_bootparams = None): |
134 | try: | 134 | try: |
135 | threadsock, threadport = self.create_socket() | 135 | threadsock, threadport = self.create_socket() |
136 | self.server_socket, self.serverport = self.create_socket() | 136 | self.server_socket, self.serverport = self.create_socket() |