Commit Graph

61 Commits

Author SHA1 Message Date
Zhai Edwin 0bc244181f qemu-script: Remove mmap_min_addr check
qemu 0.13.0 can handle mmap_min_addr well, and patch to remove checks in
sanity.bbclass has already in oe-core mailinglist by Raj. This patch does
the same thing for qemu-script.

(From OE-Core rev: 48181023314ac09743b958b0035399797fe6cff9)

Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-03-04 22:26:39 +00:00
Liping Ke ae4f5c942e Add extra parameters options for poky-qemu scripts
In order to support qemu user's flexibility requirement, we add extra
parameter options, user can add extra params such as "<-m 256>"
in poky-qemu script command.

Signed-off-by: Liping ke <liping.ke@intel.com>
2010-12-16 15:53:09 +00:00
Scott Garman ba5e0b9531 Make poky-qemu and related scripts work with arbitrary SDK locations
* No longer assume SDK toolchains are installed in /opt/poky
* [BUGFIX #568] where specifying paths to both the kernel and fs
  image caused an error due to POKY_NATIVE_SYSROOT never being
  set, triggering failure of poky-qemu-ifup/ifdown
* Cosmetic improvements to usage() functions by using basename

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
2010-12-09 15:00:45 +00:00
Bruce Ashfield e0194e3c91 qemumips: re-enable wacom and standard USB UI options
Fixes [BUGID #394]

Now that the qemu/mti mips kernel branches have been fixed
for wacom USB interaction, we can re-nable the standard set
of qemu UI options for qemumips.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
2010-11-10 21:22:26 +08:00
Scott Garman 9a2ae44380 poky-qemu-internal: make the -no-reboot qemu option mandatory
This fixes [BUGID #100]

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
2010-10-14 20:12:04 +01:00
Scott Garman 7d7d35f369 poky-qemu: miscellaneous bugfixes
In scenarios where the POKY_NATIVE_SYSROOT env variable hasn't been
set up, bug #427 can still be triggered. This fixes it by running
setup_tmpdir(). This fixes [BUGID #427].

Also, the qemu tap dev lock directory needs to be chmod 777 so that
multiple users can create and delete lock files.

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
2010-10-14 20:12:04 +01:00
Scott Garman d393edda26 poky-qemu-internal: enforce a 128M memory limit for qemuarm
This fixes [BUGID #433]

Also set a sane default for the ifconfig command, which simplifies
our autobuilder sanity test setup.

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
2010-10-12 17:21:39 +01:00
Scott Garman c805a6ed28 poky-qemu-internal: implement file locking in bash
There does not appear to be a universal lockfile utility that
meets our needs. For example:

* 'lockfile' is part of the procmail pacakge in Ubuntu, a
  requirement we don't want to impose on our users
* lockfile-[create|remove] from the Ubuntu lockfile-progs
  package does not appear to be available in Fedora/openSUSE

So, the most portable way to do this is just to implement it
in bash. The likelihood of race conditions is minimal for
what we need this for.

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
2010-10-08 14:48:20 -07:00
Scott Garman 0f973ed665 Merge runqemu features into poky-qemu
This merges the functionality of the runqemu script into poky-qemu.
It also removes the requirement to order command line args to poky-qemu
in any particular order.

This fixes a slew of runqemu-related bugs by making the runqemu script
obsolete (and fixing the issues in the new poky-qemu), including
[BUGID #294] [BUGID #295] [BUGID #371] and [BUGID #324].

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
2010-10-07 19:57:34 +01:00
Scott Garman e70c8981f2 Allow running of multiple QEMU nfs instances
These changes allow multiple instances of the userspace NFS server
to run, when brought up by consecutive instances of the poky-qemu
control script.

This fixes [BUGID #393]

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
2010-10-07 19:55:50 +01:00
Scott Garman 8532405c1d poky-gen-tapdevs: script to create a 'bank' of tap interfaces
This script can be used to create and configure a 'bank' of tap
interfaces that can be used by the poky-qemu script.

It is useful in locked-down enterprise environments where developers
do not have sudo access, but need to be able to run QEMU with
networking. A sysadmin would then use this script to bring up a
number of tap interfaces for the user to make use of.

This fixes [BUGID #391]

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
2010-10-07 19:53:46 +01:00
Scott Garman 62625d0ca0 poky-qemu-internal: use lockfile-progs for network interface locking
The 'lockfile' utility originally used comes from the procmail
package, which users shouldn't have to install. This uses the
more general lockfile-progs utilities to acheive the same end.

This fixes [BUGID #389]

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
2010-10-07 19:52:32 +01:00
Scott Garman fcbd67c047 poky-qemu: integrate userspace nfsroot support
This is the first phase of some refactoring the poky-qemu control
scripts are getting. This integrates userspace nfsroot support into
poky-qemu, making runqemu-nfs obsolete.

This fixes [BUGID #295]

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
2010-10-07 19:51:36 +01:00
Richard Griffiths ce7101b1f0 qemumips: override default UI options.
Fixes [BUGID #99]

The mouse, usb and cursor devices don't work for the
qemumips machine. There's no easy way to 'undo' the
defaults, or dynamically remove them, so we simply
don't use the default UI options for this machine type.

Mouse and pointer are provided via ps/2 and not via
the usb and wacom tablet driver.

Signed-off-by: Richard Griffiths <rgriffit@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
2010-10-04 09:40:58 +01:00
Joshua Lock b9369741db poky-qemu-internal: only check mmap_min_addr when running arm images
No need to force users to poke /proc/sys when they don't need to.

Signed-off-by: Joshua Lock <josh@linux.intel.com>
2010-10-01 16:47:38 +01:00
Joshua Lock 7f7c185cf1 Revert "Drop vm_mmap_min_addr checks from scripts and sanity class"
This reverts commit 138df217ef.

We still need the vm_mmap_min_addr set to 0 to run locale generation for
qemu-arm

Signed-off-by: Joshua Lock <josh@linux.intel.com>
2010-09-29 17:10:41 +01:00
Dongxiao Xu 5c8fad6544 poky-qemu-internal: Add userspace nfs support for mips and ppc
Add userspace nfs support for mips and ppc architecture.
This fixes [BUGID #343]

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
2010-09-27 08:59:15 -07:00
Saul Wold 0be92981b3 poky-qemu-internal: fix locking of tap lockfile
Signed-off-by: Saul Wold <Saul.Wold@intel.com>
2010-09-17 11:30:44 -07:00
Richard Purdie 8e43883f97 scrtips/poky-qemu: Fix network interface device numbering
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-09-10 10:45:55 +01:00
Richard Purdie 3dd36ababd poky-qemu-internal: Fix ifdown script to use the correct variable
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-09-10 10:45:55 +01:00
Joshua Lock 9b800fe261 scripts: use the exported POKY_NATIVE_SYSROOT variable
Rather than trying to determine things through guess-work use the newly
exported variables to determine where the native binaries reside and
whether we are running in a build directory or not.

Signed-off-by: Joshua Lock <josh@linux.intel.com>
2010-09-07 11:22:54 +01:00
Dexuan Cui e8231e0950 poky-qemu-internal: fix the echo of KERNCMDLINE
Without the fix, when the commandline is printed with the "echo" command,
it loses the quotes and this confuses people.

Thanks Richard for pointing this out.

Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
2010-08-20 16:20:13 +01:00
Scott Garman d7d803fa1c poky-qemu-internal: fix broken call to poky-qemu-ifup
The poky-qemu-ifup script now requires a path to the native
sysroot as an argument. This fixes a case where the argument
was missing.

Also, set up NATIVE_SYSROOT_DIR when running runqemu.

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
2010-08-20 16:20:12 +01:00
Scott Garman f203df83a5 poky-qemu-internal: fixes for userspace NFS booting
Including a number of cases where the script could exit before
releasing a tun/tap lockfile.

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
2010-08-20 16:20:11 +01:00
Jeff Dike 81ff1ee237 poky-qemu-internal: Support use of a preconfigured tap device
This patch makes poky-qemu-internal check for the existence of an
available preconfigured tap device before running poky-qemu-ifup to
make a new one.

Locking is handled with a lockfile in /tmp/qemu-tap-locks/.  This uses
the lockfile utility, so that needs to be present on the host.  On
exit, this script removes the lock file so that the tap device may be
reused.

Signed-off-by: Jeff Dike <jdike@linux.intel.com>
2010-08-20 16:20:10 +01:00
Jeff Dike 4df9f11171 poky-qemu-internal: Support NFS boots better
The image specification can now be in the form nfs-server:directory.
This makes it possible to nfs-boot from servers other than the host.
poky-qemu-internal will properly construct the kernel command line
given such a specification.

Signed-off-by: Jeff Dike <jdike@linux.intel.com>
2010-08-20 16:20:10 +01:00
Jeff Dike c791544bb0 qemu: Use a TAP device instead of slirp for networking
With this patch, a persistent TAP device is set up by poky-qemu-ifup,
which is now run before qemu.  The qemu command line now uses the
device that was constructed (rather than the hard-coded tap0) and it
is told not to run any networking scripts.

When qemu shuts down, poky-qemu-ifdown removes the TAP device.

sudo use - sudo is used to run poky-qemu-ifup.  sudo is no longer used
to run qemu, as qemu no longer needs privileges to set up networking.
poky-qemu-ifdown is run without privileges, as you can remove a TAP
device which you own.

Signed-off-by: Jeff Dike <jdike@linux.intel.com>
2010-08-20 16:20:09 +01:00
Joshua Lock fa8c028fd0 scripts: add qemux86-64 support to the qemu scripts
Signed-off-by: Joshua Lock <josh@linux.intel.com>
2010-08-02 17:54:20 +01:00
Richard Purdie bd19169a60 poky-qemu-internal: Use 128MB memory for qemumips/qemuppc
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-07-15 12:29:35 +01:00
Bruce Ashfield 21949128eb qemu-scripts: Add support for mips and powerpc machines, update qemuarm
For mips, the malta platform emulates a cirrus chipset. With the udpated
2.6.34 kernel options, we can now enable framebuffer boot for
the qemumips platform.

We need to pass a valid cpu (603e) and do a -nographic boot to
make it all the way to a prompt so graphics is disabled for now
for ppc.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
2010-07-15 11:19:10 +01:00
Saul Wold cab1009b08 Fixes for Qemu to use VGA and Touch Screen
Added usb tablet options to poky-qemu-internal script, and adjusted the
xorg.conf script for x86 to use VGA screen and tablet input device

Signed-off-by: Saul Wold <saul.wold@intel.com>
2010-06-07 16:13:00 +01:00
Joshua Lock 138df217ef Drop vm_mmap_min_addr checks from scripts and sanity class
QEMU 0.12.x is relocatable so we no longer need these tests, which is good
because it doesn't work reliably with modern kernels.

Signed-off-by: Joshua Lock <josh@linux.intel.com>
2010-05-28 15:32:41 +01:00
Nitin A Kamble b2c4aee283 poky-qemu-internal Add -show-cursor to qemux86
Without this option the need to do the blind guesswork about the
position of the pointer.

Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
2010-05-14 11:57:27 -07:00
Richard Purdie 2c1211bab9 scripts/poky-qemu-internal: Make sure qemuarm cursor is visible
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2009-11-26 09:18:08 +00:00
Richard Purdie de687629d8 scripts: Update qemux86 to use the vmmouse driver, not wacom and find moblin images
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2009-06-10 12:15:48 +01:00
Richard Purdie 072545b111 scripts/poky-qemu-internal: Add support for GL passthrough in qemux86 images 2009-01-21 17:40:51 +00:00
Richard Purdie eae7eb5bd5 scripts: Update qemu scripts with changes in recent qemu calling conventions and the switch to ext3 images 2009-01-05 16:00:31 +00:00
Richard Purdie da743fb70c scripts/poky-qemu-internal: Add usb commandline to nfs mounted images 2008-12-15 10:58:03 +00:00
Richard Purdie dba4931a29 scripts/poky-qemu-internal: Fix networking on qemuarm ext2 images
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4940 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-07-24 13:51:45 +00:00
Marcin Juszkiewicz cf9ecbaa6d poky-qemu-internal: added support for qemuarmv6/7
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4927 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-07-22 11:26:14 +00:00
Richard Purdie f6d5b98a58 scripts/poky-qemu-internal: Check /proc/sys/vm/mmap_min_addr value and error if its potentially problematic
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4437 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-05-06 09:22:01 +00:00
Marcin Juszkiewicz f715ee6df7 poky-qemu-internal: give 128M for qemux86 - otherwise generating of locales fails
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4412 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-05-05 08:26:05 +00:00
Richard Purdie 56a4a6f5c8 scripts/poky-qemu-internal: Enable n800 networking
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4333 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-04-24 22:13:25 +00:00
Ross Burton 85049069b0 Allow user-specified options to be passed to qemu via poky-qemu
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4327 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-04-24 14:30:55 +00:00
Richard Purdie 8add63f66d scripts/poky-qemu: Add support for the nokia800-maemo machine
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4315 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-04-23 09:58:18 +00:00
Richard Purdie faf55131c9 scripts: Add support for nokia800 to runqemu
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4226 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-04-10 09:50:54 +00:00
Richard Purdie 36ed211c35 scripts: Mark qemu scripts as bash specific to avoid dash problems and error if a suitable qemu binary can't be found
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3859 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-02-22 16:23:33 +00:00
Richard Purdie 1f1bd04e95 scripts/poky-qemu-internal: Fix no-reboot option handling for qemuarm
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3674 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-02-06 12:02:10 +00:00
Richard Purdie ca2c506f96 scripts/poky-qemu-internal: Fix PATH usage to find qemu binary
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3667 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-02-04 19:29:39 +00:00
Richard Purdie 5bc44c708b scripts: Fix sdk compiler location handling
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3652 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-01-31 18:45:32 +00:00