[oe-commits] Max Eliaser : qemux86: support X11 when QEMU is emulating a different GPU than vmware

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: dbf9cbff0adcdefac97bb482ad059fb246e3a05e
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=dbf9cbff0adcdefac97bb482ad059fb246e3a05e

Author: Max Eliaser <max.eliaser at intel.com>
Date:   Tue Aug 26 10:34:11 2014 -0700

qemux86: support X11 when QEMU is emulating a different GPU than vmware

QEMU is capable of emulating four different VGA adapters: cirrus, std, vmware,
and QXL. By adding the cirrus and fbdev X.Org drivers to the qemux86 image,
the image can be made to launch an X server on when cirrus and std are chosen,
in addition to just vmware. (The build of QEMU in OE-Core appears to have QXL
disabled, meaning a driver for it is unnecessary.)

The runqemu script now allows the choice of emulated VGA adapter to be
specified manually, so it's important that qemux86 supports any configuration
the user might choose without requiring the image to be rebuilt.

Signed-off-by: Max Eliaser <max.eliaser at intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/conf/machine/qemux86.conf | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf
index ebc27db..3562276 100644
--- a/meta/conf/machine/qemux86.conf
+++ b/meta/conf/machine/qemux86.conf
@@ -19,6 +19,8 @@ XSERVER = "xserver-xorg \
            xf86-input-vmmouse \
            xf86-input-keyboard \
            xf86-input-evdev \
+           xf86-video-cirrus \
+           xf86-video-fbdev \
            xf86-video-vmware"
 
 MACHINE_FEATURES += "x86"