Skip to content

Commit

Permalink
prepare for future GPLv2+ relicensing
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
bonzini authored and Anthony Liguori committed Jan 13, 2012
1 parent a10348c commit 6b620ca
Show file tree
Hide file tree
Showing 73 changed files with 200 additions and 4 deletions.
2 changes: 2 additions & 0 deletions aio.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 2 additions & 0 deletions block-migration.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 2 additions & 0 deletions block/raw-posix-aio.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions block/rbd.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 3 additions & 0 deletions block/sheepdog.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 2 additions & 0 deletions buffered_file.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 2 additions & 0 deletions compatfd.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions event_notifier.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
12 changes: 12 additions & 0 deletions event_notifier.h
Original file line number Diff line number Diff line change
@@ -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

Expand Down
4 changes: 2 additions & 2 deletions exec-obsolete.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
*/

Expand Down
2 changes: 2 additions & 0 deletions hmp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 3 additions & 0 deletions hw/ac97.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 3 additions & 0 deletions hw/acpi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 3 additions & 0 deletions hw/acpi_piix4.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 3 additions & 0 deletions hw/ads7846.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 3 additions & 0 deletions hw/apm.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 3 additions & 0 deletions hw/bitbang_i2c.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 3 additions & 0 deletions hw/bonito.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/

/*
Expand Down
3 changes: 3 additions & 0 deletions hw/collie.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 3 additions & 0 deletions hw/ds1338.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 3 additions & 0 deletions hw/ecc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 3 additions & 0 deletions hw/framebuffer.c
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 3 additions & 0 deletions hw/gumstix.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/

/*
Expand Down
3 changes: 3 additions & 0 deletions hw/ivshmem.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 2 additions & 0 deletions hw/kvmclock.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 3 additions & 0 deletions hw/lan9118.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 3 additions & 0 deletions hw/mainstone.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 3 additions & 0 deletions hw/marvell_88w8618_audio.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 3 additions & 0 deletions hw/max111x.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 3 additions & 0 deletions hw/mips_fulong2e.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/

/*
Expand Down
3 changes: 3 additions & 0 deletions hw/msix.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 3 additions & 0 deletions hw/mst_fpga.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 3 additions & 0 deletions hw/musicpal.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 3 additions & 0 deletions hw/nand.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions hw/pl031.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 3 additions & 0 deletions hw/pxa2xx_keypad.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 3 additions & 0 deletions hw/pxa2xx_lcd.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 3 additions & 0 deletions hw/pxa2xx_mmci.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 3 additions & 0 deletions hw/pxa2xx_pcmcia.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 2 additions & 0 deletions hw/smbios.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading

0 comments on commit 6b620ca

Please sign in to comment.