upstream integration
This patch is a merge of a series of 42 upstream integration patches
into the emulator's master branch.
The individual patches come from the 'upstream-integrate'
branch that was uploaded separately on kernel.org.
The reference upstream sources used for this integration come
from http://meego.gitorious.org/qemu-maemo/qemu using the following
hash:
7243fbd089cce3c06ca24ed173a251f32644863c
In a nutshell, the goal is to make our source tree closer to upstream
in order to use various improvement there. Unfortunately, we're not to
the point where we can use the upstream ARMv7-A / NEON translator,
though we're getting close.
Major changes are:
- integrate upstream TCG and softfloat
- target-arm: Move most Android-specific helper functions to helper-android.c
and translate-android.h. This is in preparation of a _major_ integration
of the upstream ARM translator.
- moving various functions to different files (e.g. cpus.c,
qemu-os-posix.c, qemu-os-win32.c, arch_init.c, etc)
- qemu-char-android.c is now gone. We're using qemu-char.c
with slight modifications embedded within CONFIG_ANDROID-guarded
ifdef blocks.
- rename "trace.h" to "android-trace.h". We still need to keep
"trace.h" and "trace_common.h" until we also update
sdk/emulator/tools/qtools/ to use the new header names.
After this, we will integrate in a future integration
the auto-generated trace.h used by upstream.
- remove the OutputChannel hack. Instead, implement a "fake Monitor"
object that can be used with any function that takes a Monitor as
input. The fake Monitor is used to collect output into a dynamic
buffer (e.g. during snapshot save/load).
- convert to upstream QEMUTimer API changes.
- implement physical memory with RAMBlock lists (instead of a single array).
Short log of individual changes:
406a59b trace.h: rename to trace-android.h
288208c target-arm/translate.c: move Android-specific stuff out.
f1d9bf1 tcg: integrate upstream version
280afa0 ramblocks: integrate upstream implementation (sophisticated)
ae3098a vl-android.c: move arch-specific functions to arch_init.c
23ca2ae vl-android.c: move cpu functions to cpus.c
c1ac40a vl-android.c: use os-specific setup routines
e49c3f3 compatfd.c: minor integrate
4276038 cpu-exec.c: minor integrate
3b2846a qemu-char-android.c: rename to qemu-char.c
f645f7d cpu_restore_state: remove un-necessary argument.
f0753ac qjson.c: minor integrate
8354d2d vl-android.c: Move code to iohandler.c
d3d4468 translate-all.c: minor integrate
1f9ec0f qemu-config.c: minor integrate
d09775c monitor.c: minor integrate
9f64011 disas.c: minor integrate
69ed952 device_tree.c: minor integrate
e1c0948 bswap.h + others: minor integrate
6b9236d buffered_file.c: minor integrate
95a83ce savevm: Remove OutputBuffer hack.
986acc9 savevm.c: minor integrate
39373b1 arm-semi.c: minor integrate
fb955c7 README: minor integrate
8ee4e5e trace: simplify code and avoid conflicts
65d1521 acl.c: minor integrate
c98cf7b arm-dis.c: minor integrate
bfec547 fpu: upstream integrate
9bfb3d5 json-lexer.c, json-parser.c: minor integrate
6eaacfb trace.h: minor C compatibility fixes.
17410ee qemu-char.h, console.h: upstream integration
5973c77 qemu-timer.c: rename qemu_timer_new_scale()
317c9d5 qemu-timer.c: upstream integrate
47dc1f4 qerror: minor integrate
488bfd5 qemu-error: minor integrate
1646b4e posix-aio-compat.c: minor integrate
088edf8 os-posix.c + os-win32.c and dependencies
795bb19 qemu-common.h: other intergrates
45c3be0 integrate: qemu-common.h changes
Change-Id: If5771dd4b030c602b99845d7489d1f55406bf159