[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH] Mark future contributions to GPLv2-only files as GP
|
From: |
Paolo Bonzini |
|
Subject: |
[Qemu-devel] [PATCH] Mark future contributions to GPLv2-only files as GPLv2+ |
|
Date: |
Fri, 21 Oct 2011 16:03:21 +0200 |
Even for files are licensed GPLv2-only, let's not play catch with
ourselves, and explicitly declare that future contributions to those
files will also be available as "any later version".
Signed-off-by: Paolo Bonzini <address@hidden>
---
aio.c | 2 ++
block-migration.c | 2 ++
block/raw-posix-aio.h | 2 ++
block/rbd.c | 2 ++
block/sheepdog.c | 3 +++
buffered_file.c | 2 ++
compatfd.c | 2 ++
hmp.c | 2 ++
hw/ac97.c | 3 +++
hw/acpi.c | 3 +++
hw/acpi_piix4.c | 3 +++
hw/ads7846.c | 3 +++
hw/apm.c | 3 +++
hw/bitbang_i2c.c | 3 +++
hw/bonito.c | 3 +++
hw/collie.c | 3 +++
hw/ds1338.c | 3 +++
hw/ecc.c | 3 +++
hw/event_notifier.c | 3 +++
hw/framebuffer.c | 3 +++
hw/gumstix.c | 3 +++
hw/ivshmem.c | 3 +++
hw/kvmclock.c | 2 ++
hw/lan9118.c | 3 +++
hw/mainstone.c | 3 +++
hw/marvell_88w8618_audio.c | 3 +++
hw/max111x.c | 3 +++
hw/mips_fulong2e.c | 3 +++
hw/msix.c | 3 +++
hw/mst_fpga.c | 3 +++
hw/musicpal.c | 3 +++
hw/nand.c | 3 +++
hw/pl031.c | 2 ++
hw/pxa2xx_keypad.c | 3 +++
hw/pxa2xx_lcd.c | 3 +++
hw/pxa2xx_mmci.c | 3 +++
hw/pxa2xx_pcmcia.c | 3 +++
hw/smbios.c | 2 ++
hw/spitz.c | 3 +++
hw/ssi-sd.c | 3 +++
hw/ssi.c | 3 +++
hw/strongarm.c | 3 +++
hw/tc6393xb.c | 3 +++
hw/tosa.c | 3 +++
hw/vexpress.c | 3 +++
hw/vhost.c | 3 +++
hw/vhost_net.c | 3 +++
hw/virtio-pci.c | 2 ++
hw/virtio-serial-bus.c | 3 +++
hw/vt82c686.c | 3 +++
hw/xen_backend.c | 3 +++
hw/xen_disk.c | 3 +++
hw/xen_nic.c | 3 +++
hw/z2.c | 3 +++
iov.c | 3 +++
memory.c | 2 ++
migration-exec.c | 2 ++
migration-fd.c | 2 ++
migration-tcp.c | 2 ++
migration-unix.c | 2 ++
migration.c | 2 ++
module.c | 2 ++
net/checksum.c | 3 +++
notify.c | 2 ++
pflib.c | 2 ++
posix-aio-compat.c | 2 ++
qemu-tool.c | 2 ++
qmp.c | 2 ++
roms/SLOF | 2 +-
xen-all.c | 2 ++
xen-mapcache.c | 2 ++
xen-stub.c | 2 ++
72 files changed, 188 insertions(+), 1 deletions(-)
diff --git a/aio.c b/aio.c
index 1239ca7..c6f3cb1 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 2011-10-25 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 0bff075..32c2eea 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 2011-10-25 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 dfc63b8..d6d7275 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 2011-10-25 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 3068c82..b726c80 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 2011-10-25 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 ae857e2..d69795a 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 2011-10-25 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 fed9a22..f591ca7 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 2011-10-25 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 31654c6..3cff84c 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 2011-10-25 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/hmp.c b/hmp.c
index 34416fc..8ca3669 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 2011-10-25 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 bc69d4e..a5155b2 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 2011-10-25 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 1cf35e1..16b9834 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 2011-10-25 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 29f0f76..c3bebbb 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 2011-10-25 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 9c58a5f..76500e4 100644
--- a/hw/ads7846.c
+++ b/hw/ads7846.c
@@ -5,6 +5,9 @@
* Written by Andrzej Zaborowski <address@hidden>
*
* This code is licensed under the GNU GPL v2.
+ *
+ * Contributions after 2011-10-25 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 cdda72f..88f764c 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 2011-10-25 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 431359d..8f28ed5 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 2011-10-25 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 fdb8198..bbb20ba 100644
--- a/hw/bonito.c
+++ b/hw/bonito.c
@@ -5,6 +5,9 @@
* Copyright (c) 2010 Huacai Chen (address@hidden)
*
* This code is licensed under the GNU GPL v2.
+ *
+ * Contributions after 2011-10-25 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 8dd6e4e..1ea26d9 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 2011-10-25 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 3522af5..0dd04bd 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 2011-10-25 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 a75408b..68f5f3e 100644
--- a/hw/ecc.c
+++ b/hw/ecc.c
@@ -6,6 +6,9 @@
* Written by Andrzej Zaborowski <address@hidden>
*
* This code is licensed under the GNU GPL v2.
+ *
+ * Contributions after 2011-10-25 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/event_notifier.c b/hw/event_notifier.c
index 13f3656..cb6ea20 100644
--- a/hw/event_notifier.c
+++ b/hw/event_notifier.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 2011-10-25 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 56cf16e..177e979 100644
--- a/hw/framebuffer.c
+++ b/hw/framebuffer.c
@@ -5,6 +5,9 @@
* Written by Paul Brook <address@hidden>
*
* This code is licensed under the GNU GPLv2.
+ *
+ * Contributions after 2011-10-25 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 686a5ed..02ecb4a 100644
--- a/hw/gumstix.c
+++ b/hw/gumstix.c
@@ -6,6 +6,9 @@
* Code based on spitz platform by Andrzej Zaborowski <address@hidden>
*
* This code is licensed under the GNU GPL v2.
+ *
+ * Contributions after 2011-10-25 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 242fbea..8308572 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 2011-10-25 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 5388bc4..77c7d7f 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 2011-10-25 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 634b88e..4c26d54 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 2011-10-25 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 3ed6649..3341fc5 100644
--- a/hw/mainstone.c
+++ b/hw/mainstone.c
@@ -7,6 +7,9 @@
* Code based on spitz platform by Andrzej Zaborowski <address@hidden>
*
* This code is licensed under the GNU GPL v2.
+ *
+ * Contributions after 2011-10-25 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 f8c5242..1303340 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 2011-10-25 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 70cd1af..3930d71 100644
--- a/hw/max111x.c
+++ b/hw/max111x.c
@@ -5,6 +5,9 @@
* Written by Andrzej Zaborowski <address@hidden>
*
* This code is licensed under the GNU GPLv2.
+ *
+ * Contributions after 2011-10-25 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 04921c1..8594e6a 100644
--- a/hw/mips_fulong2e.c
+++ b/hw/mips_fulong2e.c
@@ -5,6 +5,9 @@
* Copyright (c) 2009 chenming (address@hidden)
* Copyright (c) 2010 Huacai Chen (address@hidden)
* This code is licensed under the GNU GPL v2.
+ *
+ * Contributions after 2011-10-25 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 b15bafc..d70fed7 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 2011-10-25 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 7bcd5d7..c845ecb 100644
--- a/hw/mst_fpga.c
+++ b/hw/mst_fpga.c
@@ -6,6 +6,9 @@
* <address@hidden>
*
* This code is licensed under the GNU GPL v2.
+ *
+ * Contributions after 2011-10-25 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 20553b5..3ce21f7 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 2011-10-25 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 c27783e..bb03812 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 2011-10-25 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 017a313..4b6c5f6 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 2011-10-25 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 e33959d..5750540 100644
--- a/hw/pxa2xx_keypad.c
+++ b/hw/pxa2xx_keypad.c
@@ -6,6 +6,9 @@
* or <address@hidden>
*
* This code is licensed under the GPLv2.
+ *
+ * Contributions after 2011-10-25 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 b73290c..d0fbbd1 100644
--- a/hw/pxa2xx_lcd.c
+++ b/hw/pxa2xx_lcd.c
@@ -5,6 +5,9 @@
* Written by Andrzej Zaborowski <address@hidden>
*
* This code is licensed under the GPLv2.
+ *
+ * Contributions after 2011-10-25 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 1de4979..e402b27 100644
--- a/hw/pxa2xx_mmci.c
+++ b/hw/pxa2xx_mmci.c
@@ -5,6 +5,9 @@
* Written by Andrzej Zaborowski <address@hidden>
*
* This code is licensed under the GPLv2.
+ *
+ * Contributions after 2011-10-25 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 74c6817..8c94bda 100644
--- a/hw/pxa2xx_pcmcia.c
+++ b/hw/pxa2xx_pcmcia.c
@@ -5,6 +5,9 @@
* Written by Andrzej Zaborowski <address@hidden>
*
* This code is licensed under the GPLv2.
+ *
+ * Contributions after 2011-10-25 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 c9ba43e..833ffe8 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 2011-10-25 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 23f9d41..ecc6c9a 100644
--- a/hw/spitz.c
+++ b/hw/spitz.c
@@ -5,6 +5,9 @@
* Written by Andrzej Zaborowski <address@hidden>
*
* This code is licensed under the GNU GPL v2.
+ *
+ * Contributions after 2011-10-25 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 18dabd6..5ae8a03 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 2011-10-25 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 3f4c5f9..3751dfc 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 2011-10-25 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 a3d9080..636559a 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 2011-10-25 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 c144dcf..ba4d72b 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 2011-10-25 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 b992b99..8560a93 100644
--- a/hw/tosa.c
+++ b/hw/tosa.c
@@ -6,6 +6,9 @@
*
* Code based on spitz platform by Andrzej Zaborowski <address@hidden>
* This code is licensed under the GNU GPL v2.
+ *
+ * Contributions after 2011-10-25 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 c9766dd..489d831 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 2011-10-25 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 0870cb7..6fa9bba 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 2011-10-25 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 950a6b8..1f04a96 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 2011-10-25 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 ca5923c..36e26ff 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 2011-10-25 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 a4825b9..f70c4cb 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 2011-10-25 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 2845959..13a38e4 100644
--- a/hw/vt82c686.c
+++ b/hw/vt82c686.c
@@ -5,6 +5,9 @@
* Copyright (c) 2009 chenming (address@hidden)
* Copyright (c) 2010 Huacai Chen (address@hidden)
* This code is licensed under the GNU GPL v2.
+ *
+ * Contributions after 2011-10-25 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 d876cab..6909b93 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 2011-10-25 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 8a9fac4..6602f91 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 2011-10-25 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 ef2a2d6..1b5296f 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 2011-10-25 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 a03bb33..f0474d7 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 2011-10-25 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 e7385c4..a4946ea 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 2011-10-25 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 dc5e35d..4fc47f3 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 2011-10-25 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 b7b1055..6bb71b2 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 2011-10-25 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 d0aec89..a071bf8 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 2011-10-25 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 5aa742c..95b15c7 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 2011-10-25 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 8596353..7840d56 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 2011-10-25 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 bdca72e..109f6f0 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 2011-10-25 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 91f0e61..c6a659a 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 2011-10-25 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 4046932..264d940 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 2011-10-25 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 a6bac1f..719fe5c 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 2011-10-25 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 64cb2b3..ee879bf 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 2011-10-25 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 d3c1174..35f7786 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 2011-10-25 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 e9f7fe1..2bd7c68 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 2011-10-25 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 bf58b05..63beb61 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 2011-10-25 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/roms/SLOF b/roms/SLOF
index d1d6b53..b94bde0 160000
--- a/roms/SLOF
+++ b/roms/SLOF
@@ -1 +1 @@
-Subproject commit d1d6b53b713a2b7c2c25685268fa932d28a4b4c0
+Subproject commit b94bde008b0d49ec4bfe933e110d0952d032ac28
diff --git a/xen-all.c b/xen-all.c
index b5e28ab..4d6bf1a 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 2011-10-25 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 7bcb86e..f66bc60 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 2011-10-25 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 efe2ab5..d713750 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 2011-10-25 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
*/
#include "qemu-common.h"
--
1.7.6
- [Qemu-devel] [PATCH] Mark future contributions to GPLv2-only files as GPLv2+,
Paolo Bonzini <=