The existing -cpu host option caused kernel panics when people attempted to use
the kvm option. After research and discussion, the best options appear to
be the kvm32/kvm64 cpu types so lets use these instead. These resolve
the kernel issues for me.
[YOCTO #3908]
(From OE-Core rev: bdc6d3be6ffa4ed358153f9c9332b632324f5833)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
We want the temporary file to be written in /tmp not the current
directory.
(From OE-Core rev: fcb40c11998030eb5fce89ce5a9ca567870aafa9)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This allows a clean seperation between image outputs from different
machines, and makes it possible to have convenience symlinks to make
the output ready to deploy.
This did require some surgery in runqemu; if explicit paths to the image
and kernel are not supplied then DEPLOY_DIR_IMAGE needs to be determined
from bitbake or set in the environment. However the script does try to
avoid requiring it unless it really is needed. Corresponding changes
were made in the automated testing code as well.
Based on an RFC patch by Koen Kooi <koen@dominion.thruhere.net>
(From OE-Core rev: 7e90261aec61f79680b5eaeaf5b18c7b795412a4)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
When runqemu tries to determine the MACHINE variable from a
kernel or vmdk filename that doesn't contain any known machine
name, the variable gets set to the filename. It should remain
unset and cause an error.
[YOCTO #2890]
(From OE-Core rev: 22c0668d9e0a22c095d78bab7b45ef4f803dd0d1)
Signed-off-by: Mihai Prica <mihai.prica@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Add support to boot the 'qemumicroblaze' machine in
qemu-system-microblazeel
* Use the specific machine model for a MicroBlaze system 'petalogix-ml605'
* Use the DTB generated from the kernel build as the DTB for boot
* Force use of initrd rootfs (either in ext or cpio formats)
(From OE-Core rev: 2c164a5dfc877d180ef58d46c063573621297929)
Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Add support to boot the 'qemuzynq' machine in qemu-system-arm
* Use the specific machine model for Zynq 'xilinx-zynq-a9'
* Use the DTB generated from the kernel build as the DTB for boot
* Force use of initrd rootfs (either in ext or cpio formats)
(From OE-Core rev: 1e4b1d95e1f47654e928f38cd091ffe272689844)
Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Handles qemu instances (launch, kill, restart, serial connection, logging)
Launch is blocking until login prompt and returns to the task. A qemu
serial connection is used to save the boot log and get the ip from the image.
Changed runqemu script not to error out when using custom serial option.
(From OE-Core rev: ee7d64dfcc02ba8f568b17d181e0a58d3c810076)
Signed-off-by: Radu Moisan <radu.moisan@intel.com>
Signed-off-by: Stefan Stanacar <stefanx.stanacar@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
runqemu script now takes argument "slirp" in order to
run networking on the qemu machine, without root privileges.
changed the runqemu-internal script in order not to activate
the tap devices if the option is set.
[YOCTO #1474]
(From OE-Core rev: fa7fd7b1cbcfbd01af1949d2ea09b880a0ae0175)
Signed-off-by: Andrei Dinu <andrei.adrianx.dinu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
runqemu-internal is sourced so should be returning with an error code in
case of errors. runqemu needs to deal with this.
This patch fixes up the various error paths so we're consistent and get
a sane exit status for runqemu which helps a lot in its use in the qemu
runtime testing on the autobuilder.
(From OE-Core rev: 753533b2f338ff2ef97eebd5eace7623404ae457)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If the qemu is running on a headless machine, a VNC server that only allows
connections from localhost isn't too useful.
Add a "vncpublic" option to bind a VNC server to 0.0.0.0, so it's publically
available.
(From OE-Core rev: 883666821ec46483bbfb9b3cb84c5afa8118a553)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Add support for booting an ISO image for runqemu scripts.
[YOCTO #3710]
(From OE-Core rev: edd629029979dc18905fce23b64216f15eea501f)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If you are using an image in '-serial stdio' mode, temporarily change the
terminal's interrupt character to 'Ctrl-]' for the duration of the image
run. In this way, hitting 'Ctrl-C' for something running in the image
doesn't accidentally abort the entire qemu session.
(From OE-Core rev: 642cfaac0cb515008cfc91aafe04ab1db7a51581)
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Allow vmdk images to be run through the 'runqemu' facility.
(From OE-Core rev: 9efa0aa914cae9e13d90ddf99b482ccf0936573c)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If vhost_net module is not properly installed,
runqemu script will report the error and
provide the user with a link to the guide.
Also corrected small cosmetic issues in
runqemu script messages.
Also removed <> (read/write) check.
Fixes [YOCTO #3184]
(From OE-Core rev: f7365f62325189b0f9a9a1d440f11f2356c8f01d)
Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
KVM, paravirtualization and virtio drivers are now activated
in runqemu using the kvm option flag for qemux86.
Host CPU features are also exported to guest OS (Yocto Linux).
Usage example: runqemu qemux86 core-image-x11 kvm
Implements [YOCTO #2550].
(From OE-Core rev: a35d03e2eb905de4eadc9c7df5b50bff1fb7f897)
Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
In certain edge cases, bitbake may fail to run and cause setup_tmpdir()
within runqemu to fail, and not give the user a helpful error message.
Catch this case and show the user the output of bitbake -e.
This fixes [YOCTO #3112]
(From OE-Core rev: 465d7b6e66b5a55706535e194b3e44e11ee542c6)
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
When using runqemu with distros outside oe-core then
MACHINE may not be there in local.conf so use the one
thats available in environment of runqemu which is actually
the correct one.
(From OE-Core rev: 5c3fec058a2d370fbb625901ca1822ce04927ac2)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The MACHINE/KERNEL Checks setup MACHINE is it's unset, the KVM checks valid
MACHINE is qemux86 or qemux86-64 and fail if it's unset!
[YOCTO #2970]
(From OE-Core rev: 8d5e6999caff50a4b7d9a9ba69f9875285270459)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Expand the usage to be able to specify KERNEL and ROOTFS
on commandline. This helps in using the script for booting
images that are essentially not part of OE-Core
(From OE-Core rev: c985b02130658dd64581ecf14b16e2c70d1d8db5)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The yocto-bsp tool generates kernels with additional strings within
the filename, e.g. zImage-myqemuarm.bin. Loosen the MACHINE detection
regex to work with these filenames.
Fixes [YOCTO #2890].
(From OE-Core rev: 17d616adffc3514b6778acc6ab5d6da34a7366b5)
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Added support for booting ramfs-based images (e.g, poky-tiny) which
do not have block device support.
This fixes [YOCTO #2612].
(From OE-Core rev: b09c45f017da71ff966004752f8e926ea00ac451)
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
When gl is disabled in PACKAGECONFIG then we dont need
to check for supporting libs to be present before running
qemu.
(From OE-Core rev: 6612873dc59054e6d37fa7488226218bfb759127)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
runqemu can fail to with the following message:
You need libGL.so and libGLU.so to exist in your library path to run the QEMU emulator.
Fedora package names are: mesa-libGL mesa-libGLU.
The libGL.so and libGLU.so files are provided by the mesa-libGL-devel
and mesa-libGLU-devel Fedora packages (yum provides '*/libGL*.so').
(From OE-Core rev: f2b6f9c3a8b4f87b5570b78766a118e4290d773a)
Signed-off-by: Cristian Ciupitu <cristian.ciupitu@yahoo.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
New machines need to be added and they also
have different kernel commandlines
(From OE-Core rev: 3a5432aec0faea49d2c04984cd169ceb35bba89f)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The =~ operator is not one of my favorites, not just due to portability
issues, but because it's not well known, and a lot of people might
not expect a regex operator.
The canonical shell idiom for this is to use case with alternation
and wildcards. As a side note, if you are matching anything containing
core-image-sato, you don't need to also check for core-image-sato-sdk.
(From OE-Core rev: 716ae8dbd1fb29292c9fca0f59d3807a54508e87)
Signed-off-by: Peter Seebach <peter.seebach@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Now runs with dash and busybox' ash as well as with bash
(From OE-Core rev: 2b93ed90736ed08c25561e24343a5ef2b8f7dbef)
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
I do not have "[[", just "[". Be gentle to users of legacy-free setups,
also by using '=' instead of the double notation.
(From OE-Core rev: e96ba42a977f4c07aa196ce379ecd73e4ddc23c5)
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The error message erroneously talked about TMPDIR.
Just use OE_TMPDIR everywhere to make the name of the variable obvious.
(From OE-Core rev: 7b633d0a4cf9aa05e6243974bab2b780c246f8ba)
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
When passing the nograhic option to the runqemu script, set
console=ttyS0 in the kernel options so the user can view
the kernel boot messages.
This fixes [YOCTO #1475]
(From OE-Core rev: 28f05bf6e5da9cd8f01cff50c317233e3064e3cb)
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
When qemu build failed, we can see such messages:
You need libGL.so and libGLU.so to exist in your library path and the
development headers for SDL installed to build qemu-native.
Ubuntu package names are: libgl1-mesa-dev, libglu1-mesa-dev and
libsdl1.2-dev
These pkgs have different names on Fedora distributions, and Fedora is
one the
main linux distributions, so add Fedora package names.
The following Fedora versions have these pkgs:
Fedora 9 64bit
Fedora 13 32bit
Fedora 13 64bit
Fedora 16 64bit
[YOCTO #2174]
(From OE-Core rev: 246438582f8a23ce1847bae230bce07fbb3c6d15)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
With this new emulation, existing qemuppc functionality is maintained
and other functionality such as framebuffer + sato and NFS boot are
added.
(From OE-Core rev: 52ea026df141ea23bbab38ad3a9733c15097eaa4)
Signed-off-by: Liming Wang <liming.wang@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If /dev/net/tun is either not present or is not writable by the
user, then show an appropriate error message. (QEMU needs access to this
device in order to enable networking; it may be missing if it is not
enabled or loaded into the kernel, and some distributions such as CentOS
5.x set restrictive permissions upon it.)
(From OE-Core rev: a00b94900d437828f25debce1c30ffcc0bbf29e9)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
We can't just look for *image* since it will catch up bzimage
(From OE-Core rev: c2f88c658b73da67d93312591b3e67b42f629fe3)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
On OpenSUSE within an X session, TMPDIR is set to the system temporary
directory (/tmp) which is incorrect for these scripts. Thus, change
runqemu and oe-setup-rpmrepo to use OE_TMPDIR from the external
environment rather than TMPDIR.
Fixes [YOCTO #1530]
(From OE-Core rev: 4e24c10952c7a52af7f2447595fd484692d35534)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This refactors the way rootfs filenames are auto-detected when you
run the runqemu script without an explicit rootfs filename argument.
It allows the script to use rootfs files generated by hob, and when
there are mutliple rootfs files to choose from, it will pick the
most recently created one.
Fixes [YOCTO #1437].
(From OE-Core rev: 094453f443ed592d814dfb4182a0a02f0a2552e4)
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Commit 993672fa2739794a6dd0dbd7bb232fa60522b897 removed the BUILDDIR
support from runqueue which broke the imagetest-qemu integration. We now
therefore need to set TMPDIR and pass this through the environment to
ensure the runqueue script finds the right locations without running
bitbake directly.
This patch also adds a sleep to the qemu command in the error case so that
this remains on the screen for a period of time so the user can see errors
more easily.
This change unbreaks automated testing failures on the autobuilder.
(From OE-Core rev: de470333dbdeea444199340e4cd458c13fed6a5a)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The old manner of specifying custom options to QEMU in this script
using angle brackets was a frequent source of confusion. Meanwhile,
Otavio Salvador added a decent method of specifying custom kernel
boot options to this script. This patch documents the bootparams
option and adds a similar way of specifying custom QEMU options
using qemuparams="".
This fixes [YOCTO #1019]
(From OE-Core rev: 1038df14a96d789b3f9e9e1692305ba1fea67886)
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Because unfs boot mode is unstable for qemuppc, disable
it temporarily.
(From OE-Core rev: 74ff1bc8c248824116ba4b787b10fa6ee0c13ce1)
Signed-off-by: Liming Wang <liming.wang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
On e.g. Debian libql is found under /usr/lib/x86_64-linux-gnu/libGL.so.
Use a wildcard to match different locations, as uname -i only return unknown on Debian.
(From OE-Core rev: 66e34066a0ac71f4212824b1e6353a4d323f4e21)
Signed-off-by: Anders Darander <anders@chargestorm.se>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
location of libGL has moved in ubuntu 11.10
so we look for it in the new locations
(From OE-Core rev: 8d80918995a15663db7cc9c0683d45ee8ba7d45c)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Currently the grep regexp matches any occurance of
'TMPDIR=' but if you have another variable defined
e.g. OE_BUILD_TMPDIR=xxx then that gets picked up
too.
$ bitbake -e | grep TMPDIR=\"
TMPDIR="/home/kraj/work/angstrom/build/tmp-angstrom_2010_x-eglibc"
OE_BUILD_TMPDIR="/home/kraj/work/angstrom/build/tmp-angstrom_2010_x"
So we become a bit more stringent and look for
line starting with TMPDIR
$ bitbake -e | grep ^TMPDIR=\"
TMPDIR="/home/kraj/work/angstrom/build/tmp-angstrom_2010_x-eglibc"
make sure that it greps
only TMPDIR=xxx occurance and not values of other variables
whose names happens to end with TMPDIR
(From OE-Core rev: 12ddf6c6a7559d97d9b8f84fcc89ed02e30df85d)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Richard Purdie
Paul Eggleton
Mihai Prica
Nathan Rossi
Radu Moisan
Andrei Dinu
Stefan Stanacar
Ross Burton
Chen Qi
Trevor Woerner
Björn Stenberg
Cristian Iorga
Scott Garman
Khem Raj
Saul Wold
Dennis Lan
Cristian Ciupitu
Peter Seebach
Bernhard Reutner-Fischer
Robert Yang
Liming Wang
Otavio Salvador
Anders Darander