[gnome-continuous-yocto/gnomeostree-3.28-rocko: 3905/8267] runqemu: let command line parameters override defaults

[Emmanuele Bassi <ebassi src gnome org>]

commit b359e926e238fd84362eb6c1232dfb35a66b59dd
Author: Patrick Ohly <patrick ohly intel com>
Date:   Wed Dec 21 14:11:28 2016 +0100

    runqemu: let command line parameters override defaults
    
    It may be necessary to override the parameters gathered for the qemu
    invocation. For example, the qemux86 machine configuration sets "-vga
    vmware", but when using OVMF as BIOS, only "-vga std" is supported.
    
    By putting the parameters derived from custom runqemu parameters like
    "qemuparams" after the parameters derived from the machine
    configuration the user gets the possibility to override those.
    
    (From OE-Core rev: b6feb7578d60289c8b6e376cfaac8a3ee45e72f9)
    
    Signed-off-by: Patrick Ohly <patrick ohly intel com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/runqemu |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/scripts/runqemu b/scripts/runqemu
index 0a9cb94..203992a 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -926,7 +926,7 @@ class BaseConfig(object):
 
         check_libgl(qemu_bin)
 
-        self.qemu_opt = "%s %s %s %s %s" % (qemu_bin, self.get('NETWORK_CMD'), self.qemu_opt_script, 
self.get('ROOTFS_OPTIONS'), self.get('QB_OPT_APPEND'))
+        self.qemu_opt = "%s %s %s %s %s" % (qemu_bin, self.get('NETWORK_CMD'), self.get('ROOTFS_OPTIONS'), 
self.get('QB_OPT_APPEND'), self.qemu_opt_script)
 
         if self.snapshot:
             self.qemu_opt += " -snapshot"