aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2012-01-13 17:44:23 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2012-01-13 10:55:56 -0600
commit6b620ca3b052e622eef4379cfe37c5c3db5364c9 (patch)
tree2d9cdb67c0dff2ec3c5e201b841b2ec55aaa58af
parenta10348c3ad3a1bff7c5ace95a32187780d571ebd (diff)
prepare for future GPLv2+ relicensing
All files under GPLv2 will get GPLv2+ changes starting tomorrow. event_notifier.c and exec-obsolete.h were only ever touched by Red Hat employees and can be relicensed now. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--aio.c2
-rw-r--r--block-migration.c2
-rw-r--r--block/raw-posix-aio.h2
-rw-r--r--block/rbd.c2
-rw-r--r--block/sheepdog.c3
-rw-r--r--buffered_file.c2
-rw-r--r--compatfd.c2
-rw-r--r--event_notifier.c4
-rw-r--r--event_notifier.h12
-rw-r--r--exec-obsolete.h4
-rw-r--r--hmp.c2
-rw-r--r--hw/ac97.c3
-rw-r--r--hw/acpi.c3
-rw-r--r--hw/acpi_piix4.c3
-rw-r--r--hw/ads7846.c3
-rw-r--r--hw/apm.c3
-rw-r--r--hw/bitbang_i2c.c3
-rw-r--r--hw/bonito.c3
-rw-r--r--hw/collie.c3
-rw-r--r--hw/ds1338.c3
-rw-r--r--hw/ecc.c3
-rw-r--r--hw/framebuffer.c3
-rw-r--r--hw/gumstix.c3
-rw-r--r--hw/ivshmem.c3
-rw-r--r--hw/kvmclock.c2
-rw-r--r--hw/lan9118.c3
-rw-r--r--hw/mainstone.c3
-rw-r--r--hw/marvell_88w8618_audio.c3
-rw-r--r--hw/max111x.c3
-rw-r--r--hw/mips_fulong2e.c3
-rw-r--r--hw/msix.c3
-rw-r--r--hw/mst_fpga.c3
-rw-r--r--hw/musicpal.c3
-rw-r--r--hw/nand.c3
-rw-r--r--hw/pl031.c2
-rw-r--r--hw/pxa2xx_keypad.c3
-rw-r--r--hw/pxa2xx_lcd.c3
-rw-r--r--hw/pxa2xx_mmci.c3
-rw-r--r--hw/pxa2xx_pcmcia.c3
-rw-r--r--hw/smbios.c2
-rw-r--r--hw/spitz.c3
-rw-r--r--hw/ssi-sd.c3
-rw-r--r--hw/ssi.c3
-rw-r--r--hw/strongarm.c3
-rw-r--r--hw/tc6393xb.c3
-rw-r--r--hw/tosa.c3
-rw-r--r--hw/vexpress.c3
-rw-r--r--hw/vhost.c3
-rw-r--r--hw/vhost_net.c3
-rw-r--r--hw/virtio-pci.c2
-rw-r--r--hw/virtio-serial-bus.c3
-rw-r--r--hw/vt82c686.c3
-rw-r--r--hw/xen_backend.c3
-rw-r--r--hw/xen_disk.c3
-rw-r--r--hw/xen_nic.c3
-rw-r--r--hw/z2.c3
-rw-r--r--iov.c3
-rw-r--r--memory.c2
-rw-r--r--migration-exec.c2
-rw-r--r--migration-fd.c2
-rw-r--r--migration-tcp.c2
-rw-r--r--migration-unix.c2
-rw-r--r--migration.c2
-rw-r--r--module.c2
-rw-r--r--net/checksum.c3
-rw-r--r--notify.c2
-rw-r--r--pflib.c2
-rw-r--r--posix-aio-compat.c2
-rw-r--r--qemu-tool.c2
-rw-r--r--qmp.c2
-rw-r--r--xen-all.c2
-rw-r--r--xen-mapcache.c2
-rw-r--r--xen-stub.c2
73 files changed, 200 insertions, 4 deletions
diff --git a/aio.c b/aio.c
index 1239ca7bd2..eb3bf42574 100644
--- a/aio.c
+++ b/aio.c
@@ -9,6 +9,8 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
#include "qemu-common.h"
diff --git a/block-migration.c b/block-migration.c
index 2b7edbc3d7..4467468506 100644
--- a/block-migration.c
+++ b/block-migration.c
@@ -9,6 +9,8 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
#include "qemu-common.h"
diff --git a/block/raw-posix-aio.h b/block/raw-posix-aio.h
index dfc63b89f2..ba118f616b 100644
--- a/block/raw-posix-aio.h
+++ b/block/raw-posix-aio.h
@@ -9,6 +9,8 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
#ifndef QEMU_RAW_POSIX_AIO_H
#define QEMU_RAW_POSIX_AIO_H
diff --git a/block/rbd.c b/block/rbd.c
index 7a2384c8f9..db5abf240b 100644
--- a/block/rbd.c
+++ b/block/rbd.c
@@ -7,6 +7,8 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
#include <inttypes.h>
diff --git a/block/sheepdog.c b/block/sheepdog.c
index 17a79beb24..9416400165 100644
--- a/block/sheepdog.c
+++ b/block/sheepdog.c
@@ -7,6 +7,9 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
#include "qemu-common.h"
diff --git a/buffered_file.c b/buffered_file.c
index fed9a227bb..f170aa046f 100644
--- a/buffered_file.c
+++ b/buffered_file.c
@@ -9,6 +9,8 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
#include "qemu-common.h"
diff --git a/compatfd.c b/compatfd.c
index 02306a4f71..42f81cafe4 100644
--- a/compatfd.c
+++ b/compatfd.c
@@ -9,6 +9,8 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
#include "qemu-common.h"
diff --git a/event_notifier.c b/event_notifier.c
index 2c735556a1..0b829813d3 100644
--- a/event_notifier.c
+++ b/event_notifier.c
@@ -6,8 +6,8 @@
* Authors:
* Michael S. Tsirkin <mst@redhat.com>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
*/
#include "event_notifier.h"
diff --git a/event_notifier.h b/event_notifier.h
index 24117ea97b..886222cb36 100644
--- a/event_notifier.h
+++ b/event_notifier.h
@@ -1,3 +1,15 @@
+/*
+ * event notifier support
+ *
+ * Copyright Red Hat, Inc. 2010
+ *
+ * Authors:
+ * Michael S. Tsirkin <mst@redhat.com>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ */
+
#ifndef QEMU_EVENT_NOTIFIER_H
#define QEMU_EVENT_NOTIFIER_H
diff --git a/exec-obsolete.h b/exec-obsolete.h
index f8af27ed1a..c412be95e0 100644
--- a/exec-obsolete.h
+++ b/exec-obsolete.h
@@ -6,8 +6,8 @@
* Authors:
* Avi Kivity <avi@redhat.com>
*
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
+ * This work is licensed under the terms of the GNU GPL, version 2 or
+ * later. See the COPYING file in the top-level directory.
*
*/
diff --git a/hmp.c b/hmp.c
index fd4f755232..8a777804de 100644
--- a/hmp.c
+++ b/hmp.c
@@ -9,6 +9,8 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
#include "hmp.h"
diff --git a/hw/ac97.c b/hw/ac97.c
index 0dbba3b54a..03be99b08a 100644
--- a/hw/ac97.c
+++ b/hw/ac97.c
@@ -12,6 +12,9 @@
* If you received this file as part of a commercial VirtualBox
* distribution, then only the terms of your commercial VirtualBox
* license agreement apply instead of the previous paragraph.
+ *
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
#include "hw.h"
diff --git a/hw/acpi.c b/hw/acpi.c
index 9c35f2d510..79b179be1c 100644
--- a/hw/acpi.c
+++ b/hw/acpi.c
@@ -14,6 +14,9 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>
+ *
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
#include "sysemu.h"
#include "hw.h"
diff --git a/hw/acpi_piix4.c b/hw/acpi_piix4.c
index d9075e6611..bdc55a1eaa 100644
--- a/hw/acpi_piix4.c
+++ b/hw/acpi_piix4.c
@@ -14,6 +14,9 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>
+ *
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
#include "hw.h"
#include "pc.h"
diff --git a/hw/ads7846.c b/hw/ads7846.c
index 9c58a5f59f..de3f7af127 100644
--- a/hw/ads7846.c
+++ b/hw/ads7846.c
@@ -5,6 +5,9 @@
* Written by Andrzej Zaborowski <balrog@zabor.org>
*
* This code is licensed under the GNU GPL v2.
+ *
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
#include "ssi.h"
diff --git a/hw/apm.c b/hw/apm.c
index cdda72f1de..2aead52a74 100644
--- a/hw/apm.c
+++ b/hw/apm.c
@@ -15,6 +15,9 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see <http://www.gnu.org/licenses/>
+ *
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
#include "apm.h"
diff --git a/hw/bitbang_i2c.c b/hw/bitbang_i2c.c
index 18df411ebc..93fb2ed2c8 100644
--- a/hw/bitbang_i2c.c
+++ b/hw/bitbang_i2c.c
@@ -5,6 +5,9 @@
* Copyright (c) 2008 Jan Kiszka
*
* This code is licensed under the GNU GPL v2.
+ *
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
#include "hw.h"
#include "bitbang_i2c.h"
diff --git a/hw/bonito.c b/hw/bonito.c
index 04d706aba3..f2c78377bb 100644
--- a/hw/bonito.c
+++ b/hw/bonito.c
@@ -5,6 +5,9 @@
* Copyright (c) 2010 Huacai Chen (zltjiangshi@gmail.com)
*
* This code is licensed under the GNU GPL v2.
+ *
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
/*
diff --git a/hw/collie.c b/hw/collie.c
index 8dd6e4ec7e..42f4310816 100644
--- a/hw/collie.c
+++ b/hw/collie.c
@@ -4,6 +4,9 @@
* Copyright (C) 2011 Dmitry Eremin-Solenikov
*
* This code is licensed under GNU GPL v2.
+ *
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
#include "hw.h"
#include "sysbus.h"
diff --git a/hw/ds1338.c b/hw/ds1338.c
index 3522af5b5a..f754cb7cea 100644
--- a/hw/ds1338.c
+++ b/hw/ds1338.c
@@ -5,6 +5,9 @@
* Written by Paul Brook
*
* This code is licensed under the GNU GPL v2.
+ *
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
#include "i2c.h"
diff --git a/hw/ecc.c b/hw/ecc.c
index a75408b9ae..60d1f1d4f2 100644
--- a/hw/ecc.c
+++ b/hw/ecc.c
@@ -6,6 +6,9 @@
* Written by Andrzej Zaborowski <balrog@zabor.org>
*
* This code is licensed under the GNU GPL v2.
+ *
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
#include "hw.h"
diff --git a/hw/framebuffer.c b/hw/framebuffer.c
index b43bcdff40..6bf48dc046 100644
--- a/hw/framebuffer.c
+++ b/hw/framebuffer.c
@@ -5,6 +5,9 @@
* Written by Paul Brook <paul@codesourcery.com>
*
* This code is licensed under the GNU GPLv2.
+ *
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
/* TODO:
diff --git a/hw/gumstix.c b/hw/gumstix.c
index 686a5ed86d..13a36ea5c5 100644
--- a/hw/gumstix.c
+++ b/hw/gumstix.c
@@ -6,6 +6,9 @@
* Code based on spitz platform by Andrzej Zaborowski <balrog@zabor.org>
*
* This code is licensed under the GNU GPL v2.
+ *
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
/*
diff --git a/hw/ivshmem.c b/hw/ivshmem.c
index 1aa9e3bfa1..bec2e0b8fe 100644
--- a/hw/ivshmem.c
+++ b/hw/ivshmem.c
@@ -12,6 +12,9 @@
* Copyright (c) 2006 Igor Kovalenko
*
* This code is licensed under the GNU GPL v2.
+ *
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
#include "hw.h"
#include "pc.h"
diff --git a/hw/kvmclock.c b/hw/kvmclock.c
index 5388bc489d..3b9fb20495 100644
--- a/hw/kvmclock.c
+++ b/hw/kvmclock.c
@@ -9,6 +9,8 @@
* This work is licensed under the terms of the GNU GPL version 2.
* See the COPYING file in the top-level directory.
*
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
#include "qemu-common.h"
diff --git a/hw/lan9118.c b/hw/lan9118.c
index 341a52142f..8b83fe2198 100644
--- a/hw/lan9118.c
+++ b/hw/lan9118.c
@@ -5,6 +5,9 @@
* Written by Paul Brook
*
* This code is licensed under the GNU GPL v2
+ *
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
#include "sysbus.h"
diff --git a/hw/mainstone.c b/hw/mainstone.c
index c914a4ef7d..27f59009f6 100644
--- a/hw/mainstone.c
+++ b/hw/mainstone.c
@@ -7,6 +7,9 @@
* Code based on spitz platform by Andrzej Zaborowski <balrog@zabor.org>
*
* This code is licensed under the GNU GPL v2.
+ *
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
#include "hw.h"
#include "pxa.h"
diff --git a/hw/marvell_88w8618_audio.c b/hw/marvell_88w8618_audio.c
index 855b792b9d..0cd8410622 100644
--- a/hw/marvell_88w8618_audio.c
+++ b/hw/marvell_88w8618_audio.c
@@ -5,6 +5,9 @@
* Copyright (c) 2008 Jan Kiszka
*
* This code is licensed under the GNU GPL v2.
+ *
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
#include "sysbus.h"
#include "hw.h"
diff --git a/hw/max111x.c b/hw/max111x.c
index 70cd1af24f..fc79814bf8 100644
--- a/hw/max111x.c
+++ b/hw/max111x.c
@@ -5,6 +5,9 @@
* Written by Andrzej Zaborowski <balrog@zabor.org>
*
* This code is licensed under the GNU GPLv2.
+ *
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
#include "ssi.h"
diff --git a/hw/mips_fulong2e.c b/hw/mips_fulong2e.c
index 94ef1dfd37..163a668533 100644
--- a/hw/mips_fulong2e.c
+++ b/hw/mips_fulong2e.c
@@ -5,6 +5,9 @@
* Copyright (c) 2009 chenming (chenming@rdc.faw.com.cn)
* Copyright (c) 2010 Huacai Chen (zltjiangshi@gmail.com)
* This code is licensed under the GNU GPL v2.
+ *
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
/*
diff --git a/hw/msix.c b/hw/msix.c
index 149eed22fb..f47d26bb49 100644
--- a/hw/msix.c
+++ b/hw/msix.c
@@ -9,6 +9,9 @@
*
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
+ *
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
#include "hw.h"
diff --git a/hw/mst_fpga.c b/hw/mst_fpga.c
index 93247022b9..8bfa5dda37 100644
--- a/hw/mst_fpga.c
+++ b/hw/mst_fpga.c
@@ -6,6 +6,9 @@
* <akuster@mvista.com>
*
* This code is licensed under the GNU GPL v2.
+ *
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
#include "hw.h"
#include "sysbus.h"
diff --git a/hw/musicpal.c b/hw/musicpal.c
index 522559d4b7..977ffb6e50 100644
--- a/hw/musicpal.c
+++ b/hw/musicpal.c
@@ -4,6 +4,9 @@
* Copyright (c) 2008 Jan Kiszka
*
* This code is licensed under the GNU GPL v2.
+ *
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
#include "sysbus.h"
diff --git a/hw/nand.c b/hw/nand.c
index 7f25814ddd..8597aa6b1c 100644
--- a/hw/nand.c
+++ b/hw/nand.c
@@ -11,6 +11,9 @@
* from ST Microelectronics.
*
* This code is licensed under the GNU GPL v2.
+ *
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
#ifndef NAND_IO
diff --git a/hw/pl031.c b/hw/pl031.c
index a007ff0ff2..2fb0c8ef24 100644
--- a/hw/pl031.c
+++ b/hw/pl031.c
@@ -7,6 +7,8 @@
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
#include "sysbus.h"
diff --git a/hw/pxa2xx_keypad.c b/hw/pxa2xx_keypad.c
index f86323fecf..a97d445495 100644
--- a/hw/pxa2xx_keypad.c
+++ b/hw/pxa2xx_keypad.c
@@ -6,6 +6,9 @@
* or <Akuster@mvista.com>
*
* This code is licensed under the GPLv2.
+ *
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
#include "hw.h"
diff --git a/hw/pxa2xx_lcd.c b/hw/pxa2xx_lcd.c
index 5dd4ef06d6..19a09ff131 100644
--- a/hw/pxa2xx_lcd.c
+++ b/hw/pxa2xx_lcd.c
@@ -5,6 +5,9 @@
* Written by Andrzej Zaborowski <balrog@zabor.org>
*
* This code is licensed under the GPLv2.
+ *
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
#include "hw.h"
diff --git a/hw/pxa2xx_mmci.c b/hw/pxa2xx_mmci.c
index f47c79ca4a..b505a4cc98 100644
--- a/hw/pxa2xx_mmci.c
+++ b/hw/pxa2xx_mmci.c
@@ -5,6 +5,9 @@
* Written by Andrzej Zaborowski <balrog@zabor.org>
*
* This code is licensed under the GPLv2.
+ *
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
#include "hw.h"
diff --git a/hw/pxa2xx_pcmcia.c b/hw/pxa2xx_pcmcia.c
index dc522dcf43..b15872a9d9 100644
--- a/hw/pxa2xx_pcmcia.c
+++ b/hw/pxa2xx_pcmcia.c
@@ -5,6 +5,9 @@
* Written by Andrzej Zaborowski <balrog@zabor.org>
*
* This code is licensed under the GPLv2.
+ *
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
#include "hw.h"
diff --git a/hw/smbios.c b/hw/smbios.c
index c9ba43e8d0..c57237d279 100644
--- a/hw/smbios.c
+++ b/hw/smbios.c
@@ -9,6 +9,8 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
#include "sysemu.h"
diff --git a/hw/spitz.c b/hw/spitz.c
index 82a133dfa8..9d129c22b9 100644
--- a/hw/spitz.c
+++ b/hw/spitz.c
@@ -5,6 +5,9 @@
* Written by Andrzej Zaborowski <balrog@zabor.org>
*
* This code is licensed under the GNU GPL v2.
+ *
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
#include "hw.h"
diff --git a/hw/ssi-sd.c b/hw/ssi-sd.c
index 18dabd64a6..2d89cfe522 100644
--- a/hw/ssi-sd.c
+++ b/hw/ssi-sd.c
@@ -5,6 +5,9 @@
* Written by Paul Brook
*
* This code is licensed under the GNU GPL v2.
+ *
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
#include "blockdev.h"
diff --git a/hw/ssi.c b/hw/ssi.c
index 9842fe7472..b47953a989 100644
--- a/hw/ssi.c
+++ b/hw/ssi.c
@@ -5,6 +5,9 @@
* Written by Paul Brook
*
* This code is licensed under the GNU GPL v2.
+ *
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
#include "ssi.h"
diff --git a/hw/strongarm.c b/hw/strongarm.c
index 69c117906c..fe63fd7ab7 100644
--- a/hw/strongarm.c
+++ b/hw/strongarm.c
@@ -22,6 +22,9 @@
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
#include "sysbus.h"
#include "strongarm.h"
diff --git a/hw/tc6393xb.c b/hw/tc6393xb.c
index b75fa603cf..420925ccb3 100644
--- a/hw/tc6393xb.c
+++ b/hw/tc6393xb.c
@@ -6,6 +6,9 @@
* Most features are currently unsupported!!!
*
* This code is licensed under the GNU GPL v2.
+ *
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
#include "hw.h"
#include "devices.h"
diff --git a/hw/tosa.c b/hw/tosa.c
index 6bbc6dcb2d..0caba79c98 100644
--- a/hw/tosa.c
+++ b/hw/tosa.c
@@ -6,6 +6,9 @@
*
* Code based on spitz platform by Andrzej Zaborowski <balrog@zabor.org>
* This code is licensed under the GNU GPL v2.
+ *
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
#include "hw.h"
diff --git a/hw/vexpress.c b/hw/vexpress.c
index c9ca43c89b..0f39d8da01 100644
--- a/hw/vexpress.c
+++ b/hw/vexpress.c
@@ -16,6 +16,9 @@
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
#include "sysbus.h"
diff --git a/hw/vhost.c b/hw/vhost.c
index 19a7b5c820..4778521102 100644
--- a/hw/vhost.c
+++ b/hw/vhost.c
@@ -8,6 +8,9 @@
*
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
+ *
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
#include <sys/ioctl.h>
diff --git a/hw/vhost_net.c b/hw/vhost_net.c
index 950a6b8d99..f672e9dafd 100644
--- a/hw/vhost_net.c
+++ b/hw/vhost_net.c
@@ -8,6 +8,9 @@
*
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
+ *
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
#include "net.h"
diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c
index 77b75bcd9a..caff0aa2eb 100644
--- a/hw/virtio-pci.c
+++ b/hw/virtio-pci.c
@@ -11,6 +11,8 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
#include <inttypes.h>
diff --git a/hw/virtio-serial-bus.c b/hw/virtio-serial-bus.c
index 3a9004a9b8..32e46e98cb 100644
--- a/hw/virtio-serial-bus.c
+++ b/hw/virtio-serial-bus.c
@@ -13,6 +13,9 @@
*
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
+ *
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
#include "iov.h"
diff --git a/hw/vt82c686.c b/hw/vt82c686.c
index 038128b84c..7fb88a53bf 100644
--- a/hw/vt82c686.c
+++ b/hw/vt82c686.c
@@ -5,6 +5,9 @@
* Copyright (c) 2009 chenming (chenming@rdc.faw.com.cn)
* Copyright (c) 2010 Huacai Chen (zltjiangshi@gmail.com)
* This code is licensed under the GNU GPL v2.
+ *
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
#include "hw.h"
diff --git a/hw/xen_backend.c b/hw/xen_backend.c
index d876cabb12..2673ace185 100644
--- a/hw/xen_backend.c
+++ b/hw/xen_backend.c
@@ -13,6 +13,9 @@
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
/*
diff --git a/hw/xen_disk.c b/hw/xen_disk.c
index 192e81746f..68fa36a1cf 100644
--- a/hw/xen_disk.c
+++ b/hw/xen_disk.c
@@ -14,6 +14,9 @@
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
#include <stdio.h>
diff --git a/hw/xen_nic.c b/hw/xen_nic.c
index ef2a2d6997..9a59bdad6e 100644
--- a/hw/xen_nic.c
+++ b/hw/xen_nic.c
@@ -14,6 +14,9 @@
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
#include <stdio.h>
diff --git a/hw/z2.c b/hw/z2.c
index a03bb33d1b..8d48488331 100644
--- a/hw/z2.c
+++ b/hw/z2.c
@@ -6,6 +6,9 @@
* Code is based on mainstone platform.
*
* This code is licensed under the GNU GPL v2.
+ *
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
#include "hw.h"
diff --git a/iov.c b/iov.c
index e7385c41f4..0f964939d0 100644
--- a/iov.c
+++ b/iov.c
@@ -10,6 +10,9 @@
*
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
+ *
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
#include "iov.h"
diff --git a/memory.c b/memory.c
index 5ab21129a0..6201a3749a 100644
--- a/memory.c
+++ b/memory.c
@@ -9,6 +9,8 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
#include "memory.h"
diff --git a/migration-exec.c b/migration-exec.c
index e14552ec01..6c97db973c 100644
--- a/migration-exec.c
+++ b/migration-exec.c
@@ -11,6 +11,8 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
#include "qemu-common.h"
diff --git a/migration-fd.c b/migration-fd.c
index 6211124a05..5a068c632a 100644
--- a/migration-fd.c
+++ b/migration-fd.c
@@ -9,6 +9,8 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
#include "qemu-common.h"
diff --git a/migration-tcp.c b/migration-tcp.c
index cf6a9b83d6..35a5781823 100644
--- a/migration-tcp.c
+++ b/migration-tcp.c
@@ -9,6 +9,8 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
#include "qemu-common.h"
diff --git a/migration-unix.c b/migration-unix.c
index dfcf2033c6..169de88677 100644
--- a/migration-unix.c
+++ b/migration-unix.c
@@ -9,6 +9,8 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
#include "qemu-common.h"
diff --git a/migration.c b/migration.c
index 412fdfe5bf..37af438b19 100644
--- a/migration.c
+++ b/migration.c
@@ -9,6 +9,8 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
#include "qemu-common.h"
diff --git a/module.c b/module.c
index 91f0e61cbb..106a969449 100644
--- a/module.c
+++ b/module.c
@@ -9,6 +9,8 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
#include "qemu-common.h"
diff --git a/net/checksum.c b/net/checksum.c
index 4046932e9d..264c23fe4f 100644
--- a/net/checksum.c
+++ b/net/checksum.c
@@ -13,6 +13,9 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
#include "net/checksum.h"
diff --git a/notify.c b/notify.c
index a6bac1f783..c104495537 100644
--- a/notify.c
+++ b/notify.c
@@ -9,6 +9,8 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
#include "qemu-common.h"
diff --git a/pflib.c b/pflib.c
index 64cb2b3dda..987e11001a 100644
--- a/pflib.c
+++ b/pflib.c
@@ -6,6 +6,8 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
#include "qemu-common.h"
#include "console.h"
diff --git a/posix-aio-compat.c b/posix-aio-compat.c
index cccb673d2e..d311d13890 100644
--- a/posix-aio-compat.c
+++ b/posix-aio-compat.c
@@ -9,6 +9,8 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
#include <sys/ioctl.h>
diff --git a/qemu-tool.c b/qemu-tool.c
index 226b6e890e..c73bf7152e 100644
--- a/qemu-tool.c
+++ b/qemu-tool.c
@@ -9,6 +9,8 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
#include "qemu-common.h"
diff --git a/qmp.c b/qmp.c
index 5e09b4189e..c74dde6c90 100644
--- a/qmp.c
+++ b/qmp.c
@@ -9,6 +9,8 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
#include "qemu-common.h"
diff --git a/xen-all.c b/xen-all.c
index c86ebf43cb..d1fc5972c7 100644
--- a/xen-all.c
+++ b/xen-all.c
@@ -4,6 +4,8 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
#include <sys/mman.h>
diff --git a/xen-mapcache.c b/xen-mapcache.c
index 9fecc64e97..585b559c73 100644
--- a/xen-mapcache.c
+++ b/xen-mapcache.c
@@ -4,6 +4,8 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
#include "config.h"
diff --git a/xen-stub.c b/xen-stub.c
index d403d864b3..9ea02d435e 100644
--- a/xen-stub.c
+++ b/xen-stub.c
@@ -4,6 +4,8 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
#include "qemu-common.h"