diff options
| author | Valentin Popa <valentin.popa@intel.com> | 2013-12-19 16:02:57 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-12-20 12:25:23 +0000 |
| commit | 54a43397c48c974570e3eade55163eb766994a55 (patch) | |
| tree | 772ae511e3271bc4c041f075703d5236ab19975e | |
| parent | 0c30a25c3d5f7fb1087dff45e01595329620235f (diff) | |
| download | openembedded-core-54a43397c48c974570e3eade55163eb766994a55.tar.gz openembedded-core-54a43397c48c974570e3eade55163eb766994a55.tar.bz2 openembedded-core-54a43397c48c974570e3eade55163eb766994a55.zip | |
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@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
| -rwxr-xr-x | scripts/runqemu | 1 | ||||
| -rwxr-xr-x | scripts/runqemu-internal | 12 |
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 # 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 74b0c356d0..284b88c376 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" |