runqemu: Allow user to set -vga option with qemuparams
PATCH 1/1 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.
--- scripts/runqemu | 1 + scripts/runqemu-internal | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-)
scripts/runqemu +1 -0
@@ -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" ;;
scripts/runqemu-internal +10 -2
@@ -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"
Signature · 1 line
1.8.3.2
Just noticed that this was merged but doesn't add anything to the usage() function in runqemu - can you quickly add something?
Ross
Quoted 59 lines · Valentin Popa
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 <[email protected]>--- scripts/runqemu | 1 + scripts/runqemu-internal | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-)scripts/runqemu +1
-0@@ -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" ;;scripts/runqemu-internal +10
-3@@ -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" --1.8.3.2
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Quoted 61 lines · Ross
Just noticed that this was merged but doesn't add anything to the
usage()function in runqemu - can you quickly add something?Ross
Quoted 55 lines · Valentin Popa
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 <[email protected]>--- scripts/runqemu | 1 + scripts/runqemu-internal | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-)scripts/runqemu +1
-0@@ -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" ;;scripts/runqemu-internal +10
-3@@ -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" --1.8.3.2
Quoted 4 lines
Quoted 4 lines
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
That patch doesn't add -vga as a simplified options, it just do what
"qemuparams=\"xyz\" - specify custom parameters to QEMU" in usage() says. So, it's a fix.
The problem was that you couldn't set a custom -vga for qemux86 and qemux86_64 because the default value (vmware) had a higher precedence in the command line. For qemumips* the behavior remains, but - I think - this is because nothing else but cirrus works with it. If you know something about this just let me know; maybe this has to be fixed also.