Submitter | Paolo Bonzini |
---|---|

Date | Jan. 13, 2012, 4:26 p.m. |

Message ID | <1326471974-25351-1-git-send-email-pbonzini@redhat.com> |

Download | mbox | patch |

Permalink | /patch/135917/ |

State | New |

Headers | show |

## Comments

Am 13.01.2012 17:26, schrieb Paolo Bonzini: > All files under GPLv2 will get GPLv2+ changes starting next Christmas. > event_notifier.c and exec-obsolete.h were only ever touched by Red Hat > employees and can be relicensed now. "Next Christmas" vs. 2012-01-13 in the headers. Thanks for adding the file names. Can't re-review all of it today. Andreas

## Patch

diff --git a/aio.c b/aio.c index 1239ca7..93e3b8c 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 2b7edbc..67276bf 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 dfc63b8..4151ae2 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 7a2384c..3f5e50c 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 17a79be..4f1d724 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 fed9a22..ba9c50c 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 02306a4..13ea823 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 2c73555..0b82981 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 24117ea..886222c 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 f8af27e..c412be9 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 e7659d5..35dbb9b 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 0dbba3b..4cac23f 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 9c35f2d..d21abc9 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 d9075e6..352194a 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 9c58a5f..b611810 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 cdda72f..a89dd56 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 18df411..9a9db88 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 04d706a..4f12d09 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 8dd6e4e..3609b4c 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 3522af5..137c94d 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 a75408b..f256e59 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 b43bcdf..c7a0816 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 686a5ed..d70eeb5 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 1aa9e3b..84912de 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 5388bc4..7341624 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 7e64c5d..98252ee 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 c914a4e..db2cee8 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 855b792..394c029 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 70cd1af..6ceb9e6 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 94ef1df..b0ccf3a 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 149eed2..e132312 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 9324702..7158791 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 a01e3d2..ab75df2 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 7f25814..c82e125 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 a007ff0..ba75aae 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 f86323f..5cae595 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 5dd4ef0..a518237 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 f47c79c..a62fdd8 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 dc522dc..24f1bc6 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 c9ba43e..61b6546 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 82a133d..c050a9e 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 18dabd6..d57747e 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 9842fe7..b52bfb9 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 69c1179..74a75a8 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 b75fa60..9fa1fa3 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 6bbc6dc..3697dd7 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 c9ca43c..6f47a33 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 19a7b5c..ad9d7c4 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 950a6b8..625c6e7 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 77b75bc..22d4054 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 3a9004a..31c796e 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 038128b..2a9907f 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 d876cab..978d664 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 192e817..2c81afe 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 ef2a2d6..e7669b8 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 a03bb33..3df3fb2 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 e7385c4..e4952a0 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 5ab2112..d58ccad 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 e14552e..416e4c7 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 6211124..1e4fafc 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 cf6a9b8..77ac4cb 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 dfcf203..9236bda 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 412fdfe..5e16080 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 91f0e61..d4a8e56 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 4046932..7156bc4 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 a6bac1f..2d84f55 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 64cb2b3..5d50452 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 cccb673..f2a1df6 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 226b6e8..f044f7e 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 5e09b41..72d690f 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 c86ebf4..155cfac 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 9fecc64..a65d12c 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 d403d86..8a0ba7b 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"

`All files under GPLv2 will get GPLv2+ changes starting next Christmas. 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> --- 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 ++ event_notifier.c | 4 ++-- event_notifier.h | 12 ++++++++++++ exec-obsolete.h | 4 ++-- 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/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 ++ xen-all.c | 2 ++ xen-mapcache.c | 2 ++ xen-stub.c | 2 ++ 73 files changed, 200 insertions(+), 4 deletions(-)`