From 5d8f37ad78fc66901af50c762029a501561f3b23 Mon Sep 17 00:00:00 2001 From: David 'Digit' Turner Date: Mon, 14 Sep 2009 14:32:27 -0700 Subject: 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. --- CHANGES.TXT | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'CHANGES.TXT') diff --git a/CHANGES.TXT b/CHANGES.TXT index f04d275..09b1e66 100644 --- a/CHANGES.TXT +++ b/CHANGES.TXT @@ -52,6 +52,12 @@ OTHER: Note that the option -partition-size can be used to override the AVD's setting at runtime. +- Sources have been refreshed by a large integration of upstream QEMU + sources (version 0.10.50). The integration is based on the following commit, + dated 2009-06-19: + + d2e9fd8f703203c2eeeed120b1ef6c3a6574e0ab + ============================================================================== Changes between 1.11 and 1.10 -- cgit v1.1