summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorValentin Popa <valentin.popa@intel.com>2013-12-19 16:02:57 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-12-20 12:26:30 +0000
commitdd50c4d8a0cff2c4e0b8ff54d9ecf33d00301800 (patch)
tree642b83bf0f1c3907c08d44c43eadfe7735ecf823 /scripts
parent963b69b5f3eb6dd1ff4052240eac16da6a892e4e (diff)
downloadpoky-dd50c4d8a0cff2c4e0b8ff54d9ecf33d00301800.tar.gz
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. (From OE-Core rev: 54a43397c48c974570e3eade55163eb766994a55) Signed-off-by: Valentin Popa <valentin.popa@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/runqemu1
-rwxr-xr-xscripts/runqemu-internal12
2 files changed, 11 insertions, 2 deletions
diff --git a/scripts/runqemu b/scripts/runqemu
index 9c0a03b4e2..dcb2931cac 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -156,6 +156,7 @@ while true; do
156 # to use simplified options instead 156 # to use simplified options instead
157 serial_option=`expr "$SCRIPT_QEMU_EXTRA_OPT" : '.*\(-serial\)'` 157 serial_option=`expr "$SCRIPT_QEMU_EXTRA_OPT" : '.*\(-serial\)'`
158 kvm_option=`expr "$SCRIPT_QEMU_EXTRA_OPT" : '.*\(-enable-kvm\)'` 158 kvm_option=`expr "$SCRIPT_QEMU_EXTRA_OPT" : '.*\(-enable-kvm\)'`
159 vga_option=`expr "$SCRIPT_QEMU_EXTRA_OPT" : '.*\(-vga\)'`
159 [ ! -z "$serial_option" -o ! -z "$kvm_option" ] && \ 160 [ ! -z "$serial_option" -o ! -z "$kvm_option" ] && \
160 echo "Please use simplified serial or kvm options instead" 161 echo "Please use simplified serial or kvm options instead"
161 ;; 162 ;;
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index 74b0c356d0..284b88c376 100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -357,7 +357,11 @@ fi
357 357
358if [ "$MACHINE" = "qemux86" ]; then 358if [ "$MACHINE" = "qemux86" ]; then
359 QEMU=qemu-system-i386 359 QEMU=qemu-system-i386
360 QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -vga vmware" 360 if [ ! -z "$vga_option" ]; then
361 QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS"
362 else
363 QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -vga vmware"
364 fi
361 if [ "${FSTYPE:0:3}" = "ext" -o "$FSTYPE" = "btrfs" ]; then 365 if [ "${FSTYPE:0:3}" = "ext" -o "$FSTYPE" = "btrfs" ]; then
362 KERNCMDLINE="vga=0 uvesafb.mode_option=640x480-32 root=$DROOT rw mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD" 366 KERNCMDLINE="vga=0 uvesafb.mode_option=640x480-32 root=$DROOT rw mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD"
363 QEMUOPTIONS="$QEMU_NETWORK_CMD $ROOTFS_OPTIONS $QEMU_UI_OPTIONS" 367 QEMUOPTIONS="$QEMU_NETWORK_CMD $ROOTFS_OPTIONS $QEMU_UI_OPTIONS"
@@ -381,7 +385,11 @@ fi
381 385
382if [ "$MACHINE" = "qemux86-64" ]; then 386if [ "$MACHINE" = "qemux86-64" ]; then
383 QEMU=qemu-system-x86_64 387 QEMU=qemu-system-x86_64
384 QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -vga vmware" 388 if [ ! -z "$vga_option" ]; then
389 QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS"
390 else
391 QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -vga vmware"
392 fi
385 if [ "${FSTYPE:0:3}" = "ext" -o "$FSTYPE" = "btrfs" ]; then 393 if [ "${FSTYPE:0:3}" = "ext" -o "$FSTYPE" = "btrfs" ]; then
386 KERNCMDLINE="vga=0 uvesafb.mode_option=640x480-32 root=$DROOT rw mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD" 394 KERNCMDLINE="vga=0 uvesafb.mode_option=640x480-32 root=$DROOT rw mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD"
387 QEMUOPTIONS="$QEMU_NETWORK_CMD $ROOTFS_OPTIONS $QEMU_UI_OPTIONS" 395 QEMUOPTIONS="$QEMU_NETWORK_CMD $ROOTFS_OPTIONS $QEMU_UI_OPTIONS"