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. --- LICENSE | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) (limited to 'LICENSE') diff --git a/LICENSE b/LICENSE index bfc9a1f..cbd92c0 100644 --- a/LICENSE +++ b/LICENSE @@ -1,12 +1,18 @@ -The following points clarify the QEMU licenses: +The following points clarify the QEMU license: -1) The QEMU virtual CPU core library (libqemu.a) and the QEMU PC - system emulator are released under the GNU Lesser General Public - License. +1) QEMU as a whole is released under the GNU General Public License -2) The Linux user mode QEMU emulator is released under the GNU General - Public License. +2) Parts of QEMU have specific licenses which are compatible with the +GNU General Public License. Hence each source file contains its own +licensing information. -3) QEMU is a trademark of Fabrice Bellard. +In particular, the QEMU virtual CPU core library (libqemu.a) is +released under the GNU Lesser General Public License. Many hardware +device emulation sources are released under the BSD license. -Fabrice Bellard. \ No newline at end of file +3) The Tiny Code Generator (TCG) is released under the BSD license + (see license headers in files). + +4) QEMU is a trademark of Fabrice Bellard. + +Fabrice Bellard. -- cgit v1.1