diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-02-11 14:47:44 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-02-11 14:47:44 +0000 |
| commit | a044e3de2917d54b95f1211f4d14ec30cac9a59f (patch) | |
| tree | f7379c2a6d51dcf485ac2c502dd46b01eadf057e /scripts/qemu.py | |
| parent | e47f81b617684c4546af286d307b69014a83538a (diff) | |
| parent | 920fff9093db26f3e74858e3d4182b74a6da7496 (diff) | |
Merge remote-tracking branch 'remotes/stsquad/tags/pull-testing-next-110219-1' into staging
Testing updates:
- .travis.yml tweaks and optimisations
- .cirrus.yml enabled for FreeBSD CI
- docker.py clean-ups for binfmt_misc
- more control of vm-test builds
# gpg: Signature made Mon 11 Feb 2019 13:03:14 GMT
# gpg: using RSA key F715F7CD46F94435F4F588658E520D61289519AE
# gpg: Good signature from "Alex Bennée (Master Work Key) <alex.bennee@linaro.org>" [full]
# Primary key fingerprint: 6685 AE99 E751 67BC AFC8 DF35 FBD0 DB09 5A9E 2A44
# Subkey fingerprint: F715 F7CD 46F9 4435 F4F5 8865 8E52 0D61 2895 19AE
* remotes/stsquad/tags/pull-testing-next-110219-1:
tests/vm: Be verbose while extracting compressed images
docs/devel/testing: Add -a option to usermod command on docker setup
scripts/qemu.py: allow arches use KVM for their 32bit cousins
tests/vm: expose BUILD_TARGET, TARGET_LIST and EXTRA_CONFIGURE_OPTS
tests/vm: add --build-target option
tests/vm: call make check directly for netbsd/freebsd/ubuntu.i386
tests/vm: move images to $HOME/.cache/qemu-vm/images
tests: PEP8 cleanup of docker.py, mostly white space
tests: docker.py be even smarter with persistent binfmt_misc
tests: make docker.py check for persistent configs
tests: make docker.py update use configured binfmt path
docker: add debian-buster-arm64-cross
archive-source.sh: Clone the submodules locally
MAINTAINERS: Add an entry for scripts/archive-source.sh
.travis.yml: fold --disable-tcg into alternate coroutine builds
.travis.yml: separate tools and docs into another entry
.travis.yml: stop requesting libffi & gettext from homebrew
.cirrus.yml: basic compile and test for FreeBSD
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts/qemu.py')
| -rw-r--r-- | scripts/qemu.py | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/scripts/qemu.py b/scripts/qemu.py index 0a5e02eb56..32b00af5cc 100644 --- a/scripts/qemu.py +++ b/scripts/qemu.py @@ -25,10 +25,18 @@ import tempfile LOG = logging.getLogger(__name__) +# Mapping host architecture to any additional architectures it can +# support which often includes its 32 bit cousin. +ADDITIONAL_ARCHES = { + "x86_64" : "i386", + "aarch64" : "armhf" +} def kvm_available(target_arch=None): - if target_arch and target_arch != os.uname()[4]: - return False + host_arch = os.uname()[4] + if target_arch and target_arch != host_arch: + if target_arch != ADDITIONAL_ARCHES.get(host_arch): + return False return os.access("/dev/kvm", os.R_OK | os.W_OK) |