diff options
| author | David 'Digit' Turner <digit@google.com> | 2009-09-14 14:32:27 -0700 |
|---|---|---|
| committer | David 'Digit' Turner <digit@google.com> | 2009-09-14 14:32:27 -0700 |
| commit | 5d8f37ad78fc66901af50c762029a501561f3b23 (patch) | |
| tree | 206790f8f21000850a98c4f9590a79e779106278 /android/config | |
| parent | cd059b15f2c7df69f4a087bd66900eb172e41d1c (diff) | |
| download | external_qemu-5d8f37ad78fc66901af50c762029a501561f3b23.zip external_qemu-5d8f37ad78fc66901af50c762029a501561f3b23.tar.gz external_qemu-5d8f37ad78fc66901af50c762029a501561f3b23.tar.bz2 | |
Merge upstream QEMU 10.0.50 into the Android source tree.
This change integrates many changes from the upstream QEMU sources.
Its main purpose is to enable correct ARMv6 and ARMv7 support to the
Android emulator. Due to the nature of the upstream code base, this
unfortunately also required changes to many other parts of the source.
Note that to ensure easier integrations in the future, some source files
and directories that have heavy Android-specific customization have been
renamed with an -android suffix. The original files are still there for
easier integration tracking, but *never* compiled. For example:
net.c net-android.c
qemu-char.c qemu-char-android.c
slirp/ slirp-android/
etc...
Tested on linux-x86, darwin-x86 and windows host machines.
Diffstat (limited to 'android/config')
| -rw-r--r-- | android/config/Linux/config-host.h | 1 | ||||
| -rw-r--r-- | android/config/config.h | 1 | ||||
| -rw-r--r-- | android/config/darwin-x86/config-host.h | 4 | ||||
| -rw-r--r-- | android/config/linux-x86/config-host.h | 5 | ||||
| -rw-r--r-- | android/config/windows/config-host.h | 3 |
5 files changed, 11 insertions, 3 deletions
diff --git a/android/config/Linux/config-host.h b/android/config/Linux/config-host.h index 90defbd..cc5e07a 100644 --- a/android/config/Linux/config-host.h +++ b/android/config/Linux/config-host.h @@ -6,5 +6,6 @@ #define CONFIG_GDBSTUB 1 #define CONFIG_SLIRP 1 #define QEMU_VERSION "0.8.2" +#define QEMU_PKGVERSION "Android" #define CONFIG_SKINS 1 #define CONFIG_UNAME_RELEASE "" diff --git a/android/config/config.h b/android/config/config.h index be83607..e2191e3 100644 --- a/android/config/config.h +++ b/android/config/config.h @@ -3,6 +3,7 @@ #define CONFIG_QEMU_PREFIX "/usr/gnemul/qemu-arm" #define TARGET_ARCH "arm" #define TARGET_ARM 1 +#define TARGET_PHYS_ADDR_BITS 32 #define CONFIG_TRACE 1 #define CONFIG_NAND 1 #define CONFIG_SHAPER 1 diff --git a/android/config/darwin-x86/config-host.h b/android/config/darwin-x86/config-host.h index aaf0195..23ccb13 100644 --- a/android/config/darwin-x86/config-host.h +++ b/android/config/darwin-x86/config-host.h @@ -5,9 +5,11 @@ #define CONFIG_DARWIN 1 #define CONFIG_GDBSTUB 1 #define CONFIG_SLIRP 1 -#define QEMU_VERSION "0.8.2" +#define QEMU_VERSION "0.10.50" +#define QEMU_PKGVERSION "Android" #define O_LARGEFILE 0 #define MAP_ANONYMOUS MAP_ANON +#define HAVE_IOVEC 1 #define _BSD 1 #define CONFIG_SKINS 1 #define CONFIG_UNAME_RELEASE "" diff --git a/android/config/linux-x86/config-host.h b/android/config/linux-x86/config-host.h index 90defbd..7e2ed20 100644 --- a/android/config/linux-x86/config-host.h +++ b/android/config/linux-x86/config-host.h @@ -5,6 +5,9 @@ #define HAVE_BYTESWAP_H 1 #define CONFIG_GDBSTUB 1 #define CONFIG_SLIRP 1 -#define QEMU_VERSION "0.8.2" +#define QEMU_VERSION "0.10.50" +#define QEMU_PKGVERSION "Android" #define CONFIG_SKINS 1 #define CONFIG_UNAME_RELEASE "" +#define CONFIG_IOTHREAD 1 +#define HAVE_IOVEC 1 diff --git a/android/config/windows/config-host.h b/android/config/windows/config-host.h index 8f9e0d9..6e18a02 100644 --- a/android/config/windows/config-host.h +++ b/android/config/windows/config-host.h @@ -5,6 +5,7 @@ #define CONFIG_WIN32 1 #define CONFIG_GDBSTUB 1 #define CONFIG_SLIRP 1 -#define QEMU_VERSION "0.8.2" +#define QEMU_VERSION "0.10.50" +#define QEMU_PKGVERSION "Android" #define CONFIG_SKINS 1 #define CONFIG_UNAME_RELEASE "" |