[oe-commits] Valentin Popa : runqemu: Allow user to set -vga option with qemuparams
git at git.openembedded.org
git at git.openembedded.org
Fri Dec 20 12:24:30 UTC 2013
Module: openembedded-core.git
Branch: master-next
Commit: 54a43397c48c974570e3eade55163eb766994a55
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=54a43397c48c974570e3eade55163eb766994a55
Author: Valentin Popa <valentin.popa at intel.com>
Date: Thu Dec 19 16:02:57 2013 +0200
runqemu: Allow user to set -vga option with qemuparams
At the moment, the user cannot to set -vga other then vmware
(because "vmware" is set by default); and the first argument
in qemuparams has higher precedence.
Signed-off-by: Valentin Popa <valentin.popa at intel.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>
---
scripts/runqemu | 1 +
scripts/runqemu-internal | 12 ++++++++++--
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/scripts/runqemu b/scripts/runqemu
index 9c0a03b..dcb2931 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -156,6 +156,7 @@ while true; do
# to use simplified options instead
serial_option=`expr "$SCRIPT_QEMU_EXTRA_OPT" : '.*\(-serial\)'`
kvm_option=`expr "$SCRIPT_QEMU_EXTRA_OPT" : '.*\(-enable-kvm\)'`
+ vga_option=`expr "$SCRIPT_QEMU_EXTRA_OPT" : '.*\(-vga\)'`
[ ! -z "$serial_option" -o ! -z "$kvm_option" ] && \
echo "Please use simplified serial or kvm options instead"
;;
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index 74b0c35..284b88c 100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -357,7 +357,11 @@ fi
if [ "$MACHINE" = "qemux86" ]; then
QEMU=qemu-system-i386
- QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -vga vmware"
+ if [ ! -z "$vga_option" ]; then
+ QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS"
+ else
+ QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -vga vmware"
+ fi
if [ "${FSTYPE:0:3}" = "ext" -o "$FSTYPE" = "btrfs" ]; then
KERNCMDLINE="vga=0 uvesafb.mode_option=640x480-32 root=$DROOT rw mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD"
QEMUOPTIONS="$QEMU_NETWORK_CMD $ROOTFS_OPTIONS $QEMU_UI_OPTIONS"
@@ -381,7 +385,11 @@ fi
if [ "$MACHINE" = "qemux86-64" ]; then
QEMU=qemu-system-x86_64
- QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -vga vmware"
+ if [ ! -z "$vga_option" ]; then
+ QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS"
+ else
+ QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -vga vmware"
+ fi
if [ "${FSTYPE:0:3}" = "ext" -o "$FSTYPE" = "btrfs" ]; then
KERNCMDLINE="vga=0 uvesafb.mode_option=640x480-32 root=$DROOT rw mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD"
QEMUOPTIONS="$QEMU_NETWORK_CMD $ROOTFS_OPTIONS $QEMU_UI_OPTIONS"
More information about the Openembedded-commits
mailing list