[oe-commits] [openembedded-core] 06/11: lib/oeqa/utils/qemurunner.py: add runqemuparams after kvm/nographic/snapshot/slirp

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 5255d0c768322e1d821cca69f242dac3942d798e
Author: Alexander Kanavin <alex.kanavin at gmail.com>
AuthorDate: Fri Aug 9 16:59:12 2019 +0200

    lib/oeqa/utils/qemurunner.py: add runqemuparams after kvm/nographic/snapshot/slirp
    
    Previously, 'nographic' was set first, and was overriding anything set via runqemuparams.
    
    Particularly, egl-headless from the virgl headless selftest was overriden,
    which broke the test in non-X environments.
    
    Signed-off-by: Alexander Kanavin <alex.kanavin at gmail.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/lib/oeqa/utils/qemurunner.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py
index b1999fd..fe8b77d 100644
--- a/meta/lib/oeqa/utils/qemurunner.py
+++ b/meta/lib/oeqa/utils/qemurunner.py
@@ -126,7 +126,7 @@ class QemuRunner:
             env["DEPLOY_DIR_IMAGE"] = self.deploy_dir_image
 
         if not launch_cmd:
-            launch_cmd = 'runqemu %s %s ' % ('snapshot' if discard_writes else '', runqemuparams)
+            launch_cmd = 'runqemu %s' % ('snapshot' if discard_writes else '')
             if self.use_kvm:
                 self.logger.debug('Using kvm for runqemu')
                 launch_cmd += ' kvm'
@@ -136,7 +136,7 @@ class QemuRunner:
                 launch_cmd += ' nographic'
             if self.use_slirp:
                 launch_cmd += ' slirp'
-            launch_cmd += ' %s %s' % (self.machine, self.rootfs)
+            launch_cmd += ' %s %s %s' % (runqemuparams, self.machine, self.rootfs)
 
         return self.launch(launch_cmd, qemuparams=qemuparams, get_ip=get_ip, extra_bootparams=extra_bootparams, env=env)
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.