From: Valentin Popa <valentin.popa@intel.com>
To: "Burton, Ross" <ross.burton@intel.com>
Cc: OE-core <openembedded-core@lists.openembedded.org>
Subject: Re: [PATCH] runqemu: Allow user to set -vga option with qemuparams
Date: Thu, 23 Jan 2014 12:12:27 +0200 [thread overview]
Message-ID: <52E0EB0B.1090201@intel.com> (raw)
In-Reply-To: <CAJTo0LYyvpbqXDLXH6vGjG+K+w-ZNi4Lu0UAvXFxnb6Emx=D5A@mail.gmail.com>
On 01/22/2014 05:46 PM, Burton, Ross wrote:
> Just noticed that this was merged but doesn't add anything to the
> usage() function in runqemu - can you quickly add something?
>
> Ross
>
> On 19 December 2013 14:02, Valentin Popa <valentin.popa@intel.com> wrote:
>> 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>
>> ---
>> 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"
>> --
>> 1.8.3.2
>>
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> 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.
prev parent reply other threads:[~2014-01-23 10:12 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-19 14:02 [PATCH] runqemu: Allow user to set -vga option with qemuparams Valentin Popa
2014-01-22 15:46 ` Burton, Ross
2014-01-23 10:12 ` Valentin Popa [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=52E0EB0B.1090201@intel.com \
--to=valentin.popa@intel.com \
--cc=openembedded-core@lists.openembedded.org \
--cc=ross.burton@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox