[OE-core] [PATCH 3/3] qemux86-64: support X11 when QEMU is emulating a different GPU than vmware

[Koen Kooi]

Op 19 aug. 2014, om 23:29 heeft Max Eliaser <max.eliaser at intel.com> het volgende geschreven:

> 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-64 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-64 supports any
> configuration the user might choose without requiring the image to be rebuilt.
> 
> In addition to adding the two extra drivers to the qemux86-64 image, a section
> specifying the driver to use is deleted from the image's xorg.conf, allowing
> the X server to automatically select the most appropriate driver. Testing
> shows that it does always pick the correct one.
> 
> Signed-off-by: Max Eliaser <max.eliaser at intel.com>
> ---
> meta/conf/machine/qemux86-64.conf                                    | 2 ++
> .../xorg-xserver/xserver-xf86-config/qemux86-64/xorg.conf            | 5 -----


This should be split into 2 commits.


> 2 files changed, 2 insertions(+), 5 deletions(-)
> 
> diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf
> index 642a2d9..837f9f4 100644
> --- a/meta/conf/machine/qemux86-64.conf
> +++ b/meta/conf/machine/qemux86-64.conf
> @@ -20,6 +20,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"
> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86-64/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86-64/xorg.conf
> index 10a6d9a..bbda9ea 100644
> --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86-64/xorg.conf
> +++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86-64/xorg.conf
> @@ -30,11 +30,6 @@ Section "InputDevice"
>     Option        "USB"           "on"
> EndSection
> 
> -Section "Device"
> -    Identifier    "Graphics Controller"
> -    Driver        "vmware"
> -EndSection
> -
> Section "Monitor"
>     Identifier    "Generic Monitor"
>     Option        "DPMS"
> -- 
> 1.8.3.2
> 
> -- 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>