From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:59506) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTU6o-0006vx-RB for qemu-devel@nongnu.org; Wed, 31 Oct 2012 04:57:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TTU6i-0007S3-Nx for qemu-devel@nongnu.org; Wed, 31 Oct 2012 04:57:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33504) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTU6i-0007Rx-FF for qemu-devel@nongnu.org; Wed, 31 Oct 2012 04:57:04 -0400 Date: Wed, 31 Oct 2012 10:59:18 +0200 From: "Michael S. Tsirkin" Message-ID: <20121031085918.GE8148@redhat.com> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Subject: Re: [Qemu-devel] [PATCH v1 13/13] Fixup q35/ich9 Licenses List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Jason Baron Cc: agraf@suse.de, aliguori@us.ibm.com, juzhang@redhat.com, jan.kiszka@siemens.com, qemu-devel@nongnu.org, armbru@redhat.com, blauwirbel@gmail.com, yamahata@valinux.co.jp, alex.williamson@redhat.com, kevin@koconnor.net, avi@redhat.com, mkletzan@redhat.com, pbonzini@redhat.com, lcapitulino@redhat.com, afaerber@suse.de, kraxel@redhat.com On Mon, Oct 29, 2012 at 10:11:31PM -0400, Jason Baron wrote: > From: Jason Baron > > Cleanup the q35/ich9 license headers. > > Signed-off-by: Jason Baron 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 > + * VA Linux Systems Japan K.K. > + * Copyright (C) 2012 Jason Baron > + * > + * 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 > - */ > -/* > - * Copyright (c) 2009 Isaku Yamahata > - * VA Linux Systems Japan K.K. > - * Copyright (C) 2012 Jason Baron > * > - * 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 > + * VA Linux Systems Japan K.K. > + * Copyright (C) 2012 Jason Baron > + * > + * 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 > - * VA Linux Systems Japan K.K. > - * Copyright (C) 2012 Jason Baron > - * > - * 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 > - */ > - > #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 > + * VA Linux Systems Japan K.K. > + * Copyright (C) 2012 Jason Baron > + * > + * 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 > - */ > -/* > - * Copyright (c) 2009 Isaku Yamahata > - * VA Linux Systems Japan K.K. > - * Copyright (C) 2012 Jason Baron > * > - * 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