[gnome-continuous-yocto/gnomeostree-3.28-rocko: 1400/8267] utils/qemurunner.py: QemuRunner.start() add support for specify extra kernel cmdline

[Emmanuele Bassi <ebassi src gnome org>]

commit ad6aaae4bf408dde112ffb4050a7b710984b779a
Author: Aníbal Limón <anibal limon linux intel com>
Date:   Tue Jul 12 16:29:49 2016 -0500

    utils/qemurunner.py: QemuRunner.start() add support for specify extra kernel cmdline
    
    Add ability to specify extra_bootargs (kernel cmdline) in order to enable systemd
    debug log in images that enables systemd init.
    
    [YOCTO #9299]
    
    (From OE-Core rev: 09d62551c289b5607341a4f9c46eecd6390ad774)
    
    Signed-off-by: Aníbal Limón <anibal limon linux intel com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/lib/oeqa/targetcontrol.py    |    4 ++--
 meta/lib/oeqa/utils/qemurunner.py |    8 ++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/meta/lib/oeqa/targetcontrol.py b/meta/lib/oeqa/targetcontrol.py
index 1c57efa..d3b49b7 100644
--- a/meta/lib/oeqa/targetcontrol.py
+++ b/meta/lib/oeqa/targetcontrol.py
@@ -174,8 +174,8 @@ class QemuTarget(BaseTarget):
         bb.note("Qemu log file: %s" % self.qemulog)
         super(QemuTarget, self).deploy()
 
-    def start(self, params=None, ssh=True):
-        if self.runner.start(params, get_ip=ssh):
+    def start(self, params=None, ssh=True, extra_bootparams=None):
+        if self.runner.start(params, get_ip=ssh, extra_bootparams=extra_bootparams):
             if ssh:
                 self.ip = self.runner.ip
                 self.server_ip = self.runner.server_ip
diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py
index b8ac3f0..df73120 100644
--- a/meta/lib/oeqa/utils/qemurunner.py
+++ b/meta/lib/oeqa/utils/qemurunner.py
@@ -92,7 +92,7 @@ class QemuRunner:
                 self._dump_host()
                 raise SystemExit
 
-    def start(self, qemuparams = None, get_ip = True):
+    def start(self, qemuparams = None, get_ip = True, extra_bootparams = None):
         if self.display:
             os.environ["DISPLAY"] = self.display
             # Set this flag so that Qemu doesn't do any grabs as SDL grabs
@@ -120,7 +120,11 @@ class QemuRunner:
             return False
 
 
-        self.qemuparams = 'bootparams="console=tty1 console=ttyS0,115200n8 printk.time=1" 
qemuparams="-serial tcp:127.0.0.1:{}"'.format(threadport)
+        bootparams = 'console=tty1 console=ttyS0,115200n8 printk.time=1'
+        if extra_bootparams:
+            bootparams = bootparams + ' ' + extra_bootparams
+
+        self.qemuparams = 'bootparams="{0}" qemuparams="-serial tcp:127.0.0.1:{1}"'.format(bootparams, 
threadport)
         if not self.display:
             self.qemuparams = 'nographic ' + self.qemuparams
         if qemuparams: