[gnome-continuous-yocto/gnomeostree-3.28-rocko: 2356/8267] qemux86.conf/qemux86-64.conf: set vars for runqemu

[Emmanuele Bassi <ebassi src gnome org>]

commit 64da0d77991c3bdd98a64060a338a4a2aac9551e
Author: Robert Yang <liezhi yang windriver com>
Date:   Thu Aug 25 07:41:01 2016 -0700

    qemux86.conf/qemux86-64.conf: set vars for runqemu
    
    Add qemuboot-x86.inc to reduce duplicated code, the x86/x86_64 bsps
    which can be boot by runqemu can require qemuboot-x86.inc.
    
    (From OE-Core rev: b5ff3dda2a576ba7e5d68198ea6c6eb49cf80eb8)
    
    Signed-off-by: Robert Yang <liezhi yang windriver com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/conf/machine/include/qemuboot-x86.inc |   14 ++++++++++++++
 meta/conf/machine/qemux86-64.conf          |    1 +
 meta/conf/machine/qemux86.conf             |    1 +
 3 files changed, 16 insertions(+), 0 deletions(-)
---
diff --git a/meta/conf/machine/include/qemuboot-x86.inc b/meta/conf/machine/include/qemuboot-x86.inc
new file mode 100644
index 0000000..2ff3ca9
--- /dev/null
+++ b/meta/conf/machine/include/qemuboot-x86.inc
@@ -0,0 +1,14 @@
+# For runqemu
+IMAGE_CLASSES += "qemuboot"
+QB_SYSTEM_NAME_x86 = "qemu-system-i386"
+QB_CPU_x86 = "-cpu qemu32"
+QB_CPU_KVM_x86 = "-cpu kvm32"
+
+QB_SYSTEM_NAME_x86-64 = "qemu-system-x86_64"
+QB_CPU_x86-64 = "-cpu core2duo"
+QB_CPU_KVM_x86-64 = "-cpu kvm64"
+
+QB_AUDIO_DRV = "alsa"
+QB_AUDIO_OPT = "-soundhw ac97,es1370"
+QB_KERNEL_CMDLINE_APPEND = "vga=0 uvesafb.mode_option=640x480-32 oprofile.timer=1"
+QB_OPT_APPEND = "-vga vmware -show-cursor -usb -usbdevice tablet"
diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf
index ac2c039..b191ddd 100644
--- a/meta/conf/machine/qemux86-64.conf
+++ b/meta/conf/machine/qemux86-64.conf
@@ -10,6 +10,7 @@ PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa"
 require conf/machine/include/qemu.inc
 DEFAULTTUNE ?= "core2-64"
 require conf/machine/include/tune-core2.inc
+require conf/machine/include/qemuboot-x86.inc
 
 KERNEL_IMAGETYPE = "bzImage"
 
diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf
index 5d22e52..8555fd6 100644
--- a/meta/conf/machine/qemux86.conf
+++ b/meta/conf/machine/qemux86.conf
@@ -9,6 +9,7 @@ PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa"
 
 require conf/machine/include/qemu.inc
 require conf/machine/include/tune-i586.inc
+require conf/machine/include/qemuboot-x86.inc
 
 KERNEL_IMAGETYPE = "bzImage"