Re: [Qemu-devel] [PATCH v1 13/13] Fixup q35/ich9 Licenses

[Michael S. Tsirkin]

On Mon, Oct 29, 2012 at 10:11:31PM -0400, Jason Baron wrote:
> From: Jason Baron <address@hidden>
> 
> Cleanup the q35/ich9 license headers.
> 
> Signed-off-by: Jason Baron <address@hidden>

Isaku Yamahata, could you confirm this one please?

> ---
>  hw/acpi_ich9.c  |   13 +++++++------
>  hw/lpc_ich9.c   |   32 ++++++++------------------------
>  hw/smbus_ich9.c |   14 ++++++++------
>  3 files changed, 23 insertions(+), 36 deletions(-)
> 
> diff --git a/hw/acpi_ich9.c b/hw/acpi_ich9.c
> index 61034d3..25c9d36 100644
> --- a/hw/acpi_ich9.c
> +++ b/hw/acpi_ich9.c
> @@ -2,6 +2,11 @@
>   * ACPI implementation
>   *
>   * Copyright (c) 2006 Fabrice Bellard
> + * Copyright (c) 2009 Isaku Yamahata <yamahata at valinux co jp>
> + *                    VA Linux Systems Japan K.K.
> + * Copyright (C) 2012 Jason Baron <address@hidden>
> + *
> + * This is based on acpi.c.
>   *
>   * This library is free software; you can redistribute it and/or
>   * modify it under the terms of the GNU Lesser General Public
> @@ -14,13 +19,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/>
> - */
> -/*
> - *  Copyright (c) 2009 Isaku Yamahata <yamahata at valinux co jp>
> - *                     VA Linux Systems Japan K.K.
> - *  Copyright (C) 2012 Jason Baron <address@hidden>
>   *
> - *  This is based on acpi.c.
> + * 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/lpc_ich9.c b/hw/lpc_ich9.c
> index 4116c50..90129db 100644
> --- a/hw/lpc_ich9.c
> +++ b/hw/lpc_ich9.c
> @@ -1,5 +1,13 @@
>  /*
> + * QEMU ICH9 Emulation
> + *
>   * Copyright (c) 2006 Fabrice Bellard
> + * Copyright (c) 2009, 2010, 2011
> + *               Isaku Yamahata <yamahata at valinux co jp>
> + *               VA Linux Systems Japan K.K.
> + * Copyright (C) 2012 Jason Baron <address@hidden>
> + *
> + * This is based on piix_pci.c, but heavily modified.
>   *
>   * Permission is hereby granted, free of charge, to any person obtaining a 
> copy
>   * of this software and associated documentation files (the "Software"), to 
> deal
> @@ -19,30 +27,6 @@
>   * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
>   * THE SOFTWARE.
>   */
> -/*
> - * QEMU ICH9 Emulation
> - *
> - *  Copyright (c) 2009, 2010, 2011
> - *                Isaku Yamahata <yamahata at valinux co jp>
> - *                VA Linux Systems Japan K.K.
> - *  Copyright (C) 2012 Jason Baron <address@hidden>
> - *
> - *  This is based on piix_pci.c, but heavily modified.
> - *
> - * This library is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU Lesser General Public
> - * License as published by the Free Software Foundation; either
> - * version 2 of the License, or (at your option) any later version.
> - *
> - * This library is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> - * Lesser General Public License for more details.
> - *
> - * 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/>
> - */
> -
>  #include "qemu-common.h"
>  #include "hw.h"
>  #include "range.h"
> diff --git a/hw/smbus_ich9.c b/hw/smbus_ich9.c
> index 6940583..6d31e24 100644
> --- a/hw/smbus_ich9.c
> +++ b/hw/smbus_ich9.c
> @@ -2,6 +2,11 @@
>   * ACPI implementation
>   *
>   * Copyright (c) 2006 Fabrice Bellard
> + * Copyright (c) 2009 Isaku Yamahata <yamahata at valinux co jp>
> + *               VA Linux Systems Japan K.K.
> + * Copyright (C) 2012 Jason Baron <address@hidden>
> + *
> + * This is based on acpi.c, but heavily rewritten.
>   *
>   * This library is free software; you can redistribute it and/or
>   * modify it under the terms of the GNU Lesser General Public
> @@ -14,13 +19,10 @@
>   *
>   * 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/>
> - */
> -/*
> - *  Copyright (c) 2009 Isaku Yamahata <yamahata at valinux co jp>
> - *                     VA Linux Systems Japan K.K.
> - *  Copyright (C) 2012 Jason Baron <address@hidden>
>   *
> - *  This is based on acpi.c, but heavily rewritten.
> + * 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"
> -- 
> 1.7.1