log: Fix qemu_set_log_filename() error handling

[qemu.git] / LICENSE

diff --git a/LICENSE b/LICENSE
index b403f41bd892d124393b62466359744badbfe58a..0e0b4b9553a5057ab29a20036e03ad113cfcb940 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -1,26 +1,21 @@
-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,
+version 2.
 
-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, version 2. Hence each source file contains
+its own licensing information.  Source files with no licensing information
+are released under the GNU General Public License, version 2 or (at your
+option) any later version.
 
-3) The QEMU Accelerator Module is a proprietary product. It is
-   available without charge. Commercial use of the QEMU Accelerator
-   Module is allowed.
-   
-   Redistribution of the QEMU Accelerator Module: any person or
-   organisation wishing to distribute it, for example on a CD or as a
-   binary or source package, must have an explicit authorization from
-   the author.
+As of July 2013, contributions under version 2 of the GNU General Public
+License (and no later version) are only accepted for the following files
+or directories: bsd-user/, linux-user/, hw/vfio/, hw/xen/xen_pt*.
 
-   The QEMU Accelerator Module is available without any express or
-   implied warranty. In no event will the author be held liable for
-   any damages arising from the use of this software.
+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.
\ No newline at end of file
+Fabrice Bellard and the QEMU team