[Qemu-devel] [PATCH] s390x: Fix the confusing contributions-after-2012 license statements

Thomas Huth posted 1 patch 5 years, 1 month ago
Test docker-mingw@fedora passed
Test asan passed
Test checkpatch passed
Test docker-clang@ubuntu passed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/1549456893-16589-1-git-send-email-thuth@redhat.com
Maintainers: David Hildenbrand <david@redhat.com>, Halil Pasic <pasic@linux.ibm.com>, Riku Voipio <riku.voipio@iki.fi>, Cornelia Huck <cohuck@redhat.com>, Laurent Vivier <laurent@vivier.eu>, Christian Borntraeger <borntraeger@de.ibm.com>, Richard Henderson <rth@twiddle.net>
linux-user/s390x/target_cpu.h | 19 ++++++++-----------
target/s390x/cpu.c            | 19 ++++++++-----------
target/s390x/cpu.h            | 19 ++++++++-----------
target/s390x/kvm.c            | 19 ++++++++-----------
4 files changed, 32 insertions(+), 44 deletions(-)
[Qemu-devel] [PATCH] s390x: Fix the confusing contributions-after-2012 license statements
Posted by Thomas Huth 5 years, 1 month ago
The license information in these files is rather confusing. The text
declares LGPL first, but then says that contributions after 2012 are
licensed under the GPL instead. How should the average user who just
downloaded the release tarball know which part is now GPL and which
is LGPL?

Looking at the text of the LGPL (see COPYING.LIB in the top directory),
the license clearly states how this should be done instead:

"3. You may opt to apply the terms of the ordinary GNU General Public
 License instead of this License to a given copy of the Library. To do
 this, you must alter all the notices that refer to this License, so
 that they refer to the ordinary GNU General Public License, version 2,
 instead of to this License."

Thus let's clean up the confusing statements and use the proper GPL
text only.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 linux-user/s390x/target_cpu.h | 19 ++++++++-----------
 target/s390x/cpu.c            | 19 ++++++++-----------
 target/s390x/cpu.h            | 19 ++++++++-----------
 target/s390x/kvm.c            | 19 ++++++++-----------
 4 files changed, 32 insertions(+), 44 deletions(-)

diff --git a/linux-user/s390x/target_cpu.h b/linux-user/s390x/target_cpu.h
index 66ef8aa..aa181ce 100644
--- a/linux-user/s390x/target_cpu.h
+++ b/linux-user/s390x/target_cpu.h
@@ -3,21 +3,18 @@
  *
  * Copyright (c) 2009 Ulrich Hecht
  *
- * 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 program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU 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,
+ * This program 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.
+ * General Public License for more details.
  *
- * Contributions after 2012-10-29 are licensed under the terms of the
- * GNU GPL, version 2 or (at your option) any later version.
- *
- * 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/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef S390X_TARGET_CPU_H
 #define S390X_TARGET_CPU_H
diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c
index 18ba7f8..698dd9c 100644
--- a/target/s390x/cpu.c
+++ b/target/s390x/cpu.c
@@ -6,21 +6,18 @@
  * Copyright (c) 2012 SUSE LINUX Products GmbH
  * Copyright (c) 2012 IBM Corp.
  *
- * 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.1 of the License, or (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU 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,
+ * This program 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.
+ * 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/lgpl-2.1.html>
- * Contributions after 2012-12-11 are licensed under the terms of the
- * GNU GPL, version 2 or (at your option) any later version.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "qemu/osdep.h"
diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h
index 47d2c2e..b71ac51 100644
--- a/target/s390x/cpu.h
+++ b/target/s390x/cpu.h
@@ -4,21 +4,18 @@
  *  Copyright (c) 2009 Ulrich Hecht
  *  Copyright IBM Corp. 2012, 2018
  *
- * 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 program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU 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,
+ * This program 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.
+ * General Public License for more details.
  *
- * Contributions after 2012-10-29 are licensed under the terms of the
- * GNU GPL, version 2 or (at your option) any later version.
- *
- * 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/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef S390X_CPU_H
diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c
index 8613e19..9ff80c8 100644
--- a/target/s390x/kvm.c
+++ b/target/s390x/kvm.c
@@ -4,21 +4,18 @@
  * Copyright (c) 2009 Alexander Graf <agraf@suse.de>
  * Copyright IBM Corp. 2012
  *
- * 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 program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU 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,
+ * This program 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.
+ * General Public License for more details.
  *
- * Contributions after 2012-10-29 are licensed under the terms of the
- * GNU GPL, version 2 or (at your option) any later version.
- *
- * 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/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "qemu/osdep.h"
-- 
1.8.3.1


Re: [Qemu-devel] [PATCH] s390x: Fix the confusing contributions-after-2012 license statements
Posted by Cornelia Huck 5 years, 1 month ago
On Wed,  6 Feb 2019 13:41:33 +0100
Thomas Huth <thuth@redhat.com> wrote:

> The license information in these files is rather confusing. The text
> declares LGPL first, but then says that contributions after 2012 are
> licensed under the GPL instead. How should the average user who just
> downloaded the release tarball know which part is now GPL and which
> is LGPL?

FWIW, that statement was added in ccb084d3f0ec ("s390: new
contributions GPLv2 or later").

> 
> Looking at the text of the LGPL (see COPYING.LIB in the top directory),
> the license clearly states how this should be done instead:
> 
> "3. You may opt to apply the terms of the ordinary GNU General Public
>  License instead of this License to a given copy of the Library. To do
>  this, you must alter all the notices that refer to this License, so
>  that they refer to the ordinary GNU General Public License, version 2,
>  instead of to this License."

Hm. This talks about GPL v2, not GPL v2-or-later...

> 
> Thus let's clean up the confusing statements and use the proper GPL
> text only.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  linux-user/s390x/target_cpu.h | 19 ++++++++-----------
>  target/s390x/cpu.c            | 19 ++++++++-----------
>  target/s390x/cpu.h            | 19 ++++++++-----------
>  target/s390x/kvm.c            | 19 ++++++++-----------

BTW: Is the original author of the code still around?

>  4 files changed, 32 insertions(+), 44 deletions(-)

Re: [Qemu-devel] [PATCH] s390x: Fix the confusing contributions-after-2012 license statements
Posted by Laurent Vivier 5 years, 1 month ago
On 06/02/2019 13:58, Cornelia Huck wrote:
> On Wed,  6 Feb 2019 13:41:33 +0100
> Thomas Huth <thuth@redhat.com> wrote:
> 
>> The license information in these files is rather confusing. The text
>> declares LGPL first, but then says that contributions after 2012 are
>> licensed under the GPL instead. How should the average user who just
>> downloaded the release tarball know which part is now GPL and which
>> is LGPL?
> 
> FWIW, that statement was added in ccb084d3f0ec ("s390: new
> contributions GPLv2 or later").
> 
>>
>> Looking at the text of the LGPL (see COPYING.LIB in the top directory),
>> the license clearly states how this should be done instead:
>>
>> "3. You may opt to apply the terms of the ordinary GNU General Public
>>  License instead of this License to a given copy of the Library. To do
>>  this, you must alter all the notices that refer to this License, so
>>  that they refer to the ordinary GNU General Public License, version 2,
>>  instead of to this License."
> 
> Hm. This talks about GPL v2, not GPL v2-or-later...
> 
>>
>> Thus let's clean up the confusing statements and use the proper GPL
>> text only.
>>
>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>> ---
>>  linux-user/s390x/target_cpu.h | 19 ++++++++-----------
>>  target/s390x/cpu.c            | 19 ++++++++-----------
>>  target/s390x/cpu.h            | 19 ++++++++-----------
>>  target/s390x/kvm.c            | 19 ++++++++-----------
> 
> BTW: Is the original author of the code still around?

For the linux-user/s390x/target_cpu.h, it seems this code has been pushed by Alex Graf:

commit 10ec51174ca69a4c3c5149b0b3baaa6ccba66273
Author: Alexander Graf <agraf@suse.de>
Date:   Sat Dec 5 12:44:21 2009 +0100

    S/390 CPU fake emulation
    
    Because Qemu currently requires a TCG target to exist and there are quite some
    useful helpers here to lay the groundwork for out KVM target, let's create a
    stub TCG emulation target for S390X CPUs.
    
    This is required to make tcg happy. The emulation target itself won't work
    though.
    
    Signed-off-by: Alexander Graf <agraf@suse.de>
    Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>

But the "(c) 2009 Ulrich Hecht" is confusing.

Laurent


Re: [Qemu-devel] [PATCH] s390x: Fix the confusing contributions-after-2012 license statements
Posted by Alexander Graf 5 years, 1 month ago
On 02/06/2019 02:02 PM, Laurent Vivier wrote:
> On 06/02/2019 13:58, Cornelia Huck wrote:
>> On Wed,  6 Feb 2019 13:41:33 +0100
>> Thomas Huth <thuth@redhat.com> wrote:
>>
>>> The license information in these files is rather confusing. The text
>>> declares LGPL first, but then says that contributions after 2012 are
>>> licensed under the GPL instead. How should the average user who just
>>> downloaded the release tarball know which part is now GPL and which
>>> is LGPL?
>> FWIW, that statement was added in ccb084d3f0ec ("s390: new
>> contributions GPLv2 or later").
>>
>>> Looking at the text of the LGPL (see COPYING.LIB in the top directory),
>>> the license clearly states how this should be done instead:
>>>
>>> "3. You may opt to apply the terms of the ordinary GNU General Public
>>>   License instead of this License to a given copy of the Library. To do
>>>   this, you must alter all the notices that refer to this License, so
>>>   that they refer to the ordinary GNU General Public License, version 2,
>>>   instead of to this License."
>> Hm. This talks about GPL v2, not GPL v2-or-later...
>>
>>> Thus let's clean up the confusing statements and use the proper GPL
>>> text only.
>>>
>>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>>> ---
>>>   linux-user/s390x/target_cpu.h | 19 ++++++++-----------
>>>   target/s390x/cpu.c            | 19 ++++++++-----------
>>>   target/s390x/cpu.h            | 19 ++++++++-----------
>>>   target/s390x/kvm.c            | 19 ++++++++-----------
>> BTW: Is the original author of the code still around?
> For the linux-user/s390x/target_cpu.h, it seems this code has been pushed by Alex Graf:
>
> commit 10ec51174ca69a4c3c5149b0b3baaa6ccba66273
> Author: Alexander Graf <agraf@suse.de>
> Date:   Sat Dec 5 12:44:21 2009 +0100
>
>      S/390 CPU fake emulation
>      
>      Because Qemu currently requires a TCG target to exist and there are quite some
>      useful helpers here to lay the groundwork for out KVM target, let's create a
>      stub TCG emulation target for S390X CPUs.
>      
>      This is required to make tcg happy. The emulation target itself won't work
>      though.
>      
>      Signed-off-by: Alexander Graf <agraf@suse.de>
>      Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
>
> But the "(c) 2009 Ulrich Hecht" is confusing.

Why? Ulrich was the one that started the port, I then cleaned it up, 
improved it, added system emulation and upstreamed it.

What problem exactly are you trying to solve?


Alex


Re: [Qemu-devel] [PATCH] s390x: Fix the confusing contributions-after-2012 license statements
Posted by Cornelia Huck 5 years, 1 month ago
On Mon, 11 Feb 2019 16:24:48 +0100
Alexander Graf <agraf@suse.de> wrote:

> On 02/06/2019 02:02 PM, Laurent Vivier wrote:
> > On 06/02/2019 13:58, Cornelia Huck wrote:  
> >> On Wed,  6 Feb 2019 13:41:33 +0100
> >> Thomas Huth <thuth@redhat.com> wrote:
> >>  
> >>> The license information in these files is rather confusing. The text
> >>> declares LGPL first, but then says that contributions after 2012 are
> >>> licensed under the GPL instead. How should the average user who just
> >>> downloaded the release tarball know which part is now GPL and which
> >>> is LGPL?  
> >> FWIW, that statement was added in ccb084d3f0ec ("s390: new
> >> contributions GPLv2 or later").
> >>  
> >>> Looking at the text of the LGPL (see COPYING.LIB in the top directory),
> >>> the license clearly states how this should be done instead:
> >>>
> >>> "3. You may opt to apply the terms of the ordinary GNU General Public
> >>>   License instead of this License to a given copy of the Library. To do
> >>>   this, you must alter all the notices that refer to this License, so
> >>>   that they refer to the ordinary GNU General Public License, version 2,
> >>>   instead of to this License."  
> >> Hm. This talks about GPL v2, not GPL v2-or-later...
> >>  
> >>> Thus let's clean up the confusing statements and use the proper GPL
> >>> text only.
> >>>
> >>> Signed-off-by: Thomas Huth <thuth@redhat.com>
> >>> ---
> >>>   linux-user/s390x/target_cpu.h | 19 ++++++++-----------
> >>>   target/s390x/cpu.c            | 19 ++++++++-----------
> >>>   target/s390x/cpu.h            | 19 ++++++++-----------
> >>>   target/s390x/kvm.c            | 19 ++++++++-----------  
> >> BTW: Is the original author of the code still around?  
> > For the linux-user/s390x/target_cpu.h, it seems this code has been pushed by Alex Graf:
> >
> > commit 10ec51174ca69a4c3c5149b0b3baaa6ccba66273
> > Author: Alexander Graf <agraf@suse.de>
> > Date:   Sat Dec 5 12:44:21 2009 +0100
> >
> >      S/390 CPU fake emulation
> >      
> >      Because Qemu currently requires a TCG target to exist and there are quite some
> >      useful helpers here to lay the groundwork for out KVM target, let's create a
> >      stub TCG emulation target for S390X CPUs.
> >      
> >      This is required to make tcg happy. The emulation target itself won't work
> >      though.
> >      
> >      Signed-off-by: Alexander Graf <agraf@suse.de>
> >      Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
> >
> > But the "(c) 2009 Ulrich Hecht" is confusing.  
> 
> Why? Ulrich was the one that started the port, I then cleaned it up, 
> improved it, added system emulation and upstreamed it.

It's just a bit confusing that Ulrich does not show up in the sign-off
chain.

> What problem exactly are you trying to solve?

The confusing license statements?

I thought I'd ask whether the original author had any thoughts; if you
think this patch is problematic, I can dequeue it again.

Re: [Qemu-devel] [PATCH] s390x: Fix the confusing contributions-after-2012 license statements
Posted by Alexander Graf 5 years, 1 month ago
On 02/11/2019 04:31 PM, Cornelia Huck wrote:
> On Mon, 11 Feb 2019 16:24:48 +0100
> Alexander Graf <agraf@suse.de> wrote:
>
>> On 02/06/2019 02:02 PM, Laurent Vivier wrote:
>>> On 06/02/2019 13:58, Cornelia Huck wrote:
>>>> On Wed,  6 Feb 2019 13:41:33 +0100
>>>> Thomas Huth <thuth@redhat.com> wrote:
>>>>   
>>>>> The license information in these files is rather confusing. The text
>>>>> declares LGPL first, but then says that contributions after 2012 are
>>>>> licensed under the GPL instead. How should the average user who just
>>>>> downloaded the release tarball know which part is now GPL and which
>>>>> is LGPL?
>>>> FWIW, that statement was added in ccb084d3f0ec ("s390: new
>>>> contributions GPLv2 or later").
>>>>   
>>>>> Looking at the text of the LGPL (see COPYING.LIB in the top directory),
>>>>> the license clearly states how this should be done instead:
>>>>>
>>>>> "3. You may opt to apply the terms of the ordinary GNU General Public
>>>>>    License instead of this License to a given copy of the Library. To do
>>>>>    this, you must alter all the notices that refer to this License, so
>>>>>    that they refer to the ordinary GNU General Public License, version 2,
>>>>>    instead of to this License."
>>>> Hm. This talks about GPL v2, not GPL v2-or-later...
>>>>   
>>>>> Thus let's clean up the confusing statements and use the proper GPL
>>>>> text only.
>>>>>
>>>>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>>>>> ---
>>>>>    linux-user/s390x/target_cpu.h | 19 ++++++++-----------
>>>>>    target/s390x/cpu.c            | 19 ++++++++-----------
>>>>>    target/s390x/cpu.h            | 19 ++++++++-----------
>>>>>    target/s390x/kvm.c            | 19 ++++++++-----------
>>>> BTW: Is the original author of the code still around?
>>> For the linux-user/s390x/target_cpu.h, it seems this code has been pushed by Alex Graf:
>>>
>>> commit 10ec51174ca69a4c3c5149b0b3baaa6ccba66273
>>> Author: Alexander Graf <agraf@suse.de>
>>> Date:   Sat Dec 5 12:44:21 2009 +0100
>>>
>>>       S/390 CPU fake emulation
>>>       
>>>       Because Qemu currently requires a TCG target to exist and there are quite some
>>>       useful helpers here to lay the groundwork for out KVM target, let's create a
>>>       stub TCG emulation target for S390X CPUs.
>>>       
>>>       This is required to make tcg happy. The emulation target itself won't work
>>>       though.
>>>       
>>>       Signed-off-by: Alexander Graf <agraf@suse.de>
>>>       Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
>>>
>>> But the "(c) 2009 Ulrich Hecht" is confusing.
>> Why? Ulrich was the one that started the port, I then cleaned it up,
>> improved it, added system emulation and upstreamed it.
> It's just a bit confusing that Ulrich does not show up in the sign-off
> chain.
>
>> What problem exactly are you trying to solve?
> The confusing license statements?
>
> I thought I'd ask whether the original author had any thoughts; if you
> think this patch is problematic, I can dequeue it again.

You can always combine LGPL and GPL code and the result becomes GPL 
only, so I see little problem? :)

Alex


Re: [Qemu-devel] [PATCH] s390x: Fix the confusing contributions-after-2012 license statements
Posted by Cornelia Huck 5 years, 1 month ago
On Mon, 11 Feb 2019 17:00:32 +0100
Alexander Graf <agraf@suse.de> wrote:

> On 02/11/2019 04:31 PM, Cornelia Huck wrote:
> > On Mon, 11 Feb 2019 16:24:48 +0100
> > Alexander Graf <agraf@suse.de> wrote:
> >  
> >> On 02/06/2019 02:02 PM, Laurent Vivier wrote:  
> >>> On 06/02/2019 13:58, Cornelia Huck wrote:  
> >>>> On Wed,  6 Feb 2019 13:41:33 +0100
> >>>> Thomas Huth <thuth@redhat.com> wrote:
> >>>>     
> >>>>> The license information in these files is rather confusing. The text
> >>>>> declares LGPL first, but then says that contributions after 2012 are
> >>>>> licensed under the GPL instead. How should the average user who just
> >>>>> downloaded the release tarball know which part is now GPL and which
> >>>>> is LGPL?  
> >>>> FWIW, that statement was added in ccb084d3f0ec ("s390: new
> >>>> contributions GPLv2 or later").
> >>>>     
> >>>>> Looking at the text of the LGPL (see COPYING.LIB in the top directory),
> >>>>> the license clearly states how this should be done instead:
> >>>>>
> >>>>> "3. You may opt to apply the terms of the ordinary GNU General Public
> >>>>>    License instead of this License to a given copy of the Library. To do
> >>>>>    this, you must alter all the notices that refer to this License, so
> >>>>>    that they refer to the ordinary GNU General Public License, version 2,
> >>>>>    instead of to this License."  
> >>>> Hm. This talks about GPL v2, not GPL v2-or-later...
> >>>>     
> >>>>> Thus let's clean up the confusing statements and use the proper GPL
> >>>>> text only.
> >>>>>
> >>>>> Signed-off-by: Thomas Huth <thuth@redhat.com>
> >>>>> ---
> >>>>>    linux-user/s390x/target_cpu.h | 19 ++++++++-----------
> >>>>>    target/s390x/cpu.c            | 19 ++++++++-----------
> >>>>>    target/s390x/cpu.h            | 19 ++++++++-----------
> >>>>>    target/s390x/kvm.c            | 19 ++++++++-----------  
> >>>> BTW: Is the original author of the code still around?  
> >>> For the linux-user/s390x/target_cpu.h, it seems this code has been pushed by Alex Graf:
> >>>
> >>> commit 10ec51174ca69a4c3c5149b0b3baaa6ccba66273
> >>> Author: Alexander Graf <agraf@suse.de>
> >>> Date:   Sat Dec 5 12:44:21 2009 +0100
> >>>
> >>>       S/390 CPU fake emulation
> >>>       
> >>>       Because Qemu currently requires a TCG target to exist and there are quite some
> >>>       useful helpers here to lay the groundwork for out KVM target, let's create a
> >>>       stub TCG emulation target for S390X CPUs.
> >>>       
> >>>       This is required to make tcg happy. The emulation target itself won't work
> >>>       though.
> >>>       
> >>>       Signed-off-by: Alexander Graf <agraf@suse.de>
> >>>       Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
> >>>
> >>> But the "(c) 2009 Ulrich Hecht" is confusing.  
> >> Why? Ulrich was the one that started the port, I then cleaned it up,
> >> improved it, added system emulation and upstreamed it.  
> > It's just a bit confusing that Ulrich does not show up in the sign-off
> > chain.
> >  
> >> What problem exactly are you trying to solve?  
> > The confusing license statements?
> >
> > I thought I'd ask whether the original author had any thoughts; if you
> > think this patch is problematic, I can dequeue it again.  
> 
> You can always combine LGPL and GPL code and the result becomes GPL 
> only, so I see little problem? :)

That was the conclusion, I think :)

Re: [Qemu-devel] [PATCH] s390x: Fix the confusing contributions-after-2012 license statements
Posted by Thomas Huth 5 years, 1 month ago
On 2019-02-06 13:58, Cornelia Huck wrote:
> On Wed,  6 Feb 2019 13:41:33 +0100
> Thomas Huth <thuth@redhat.com> wrote:
> 
>> The license information in these files is rather confusing. The text
>> declares LGPL first, but then says that contributions after 2012 are
>> licensed under the GPL instead. How should the average user who just
>> downloaded the release tarball know which part is now GPL and which
>> is LGPL?
> 
> FWIW, that statement was added in ccb084d3f0ec ("s390: new
> contributions GPLv2 or later").
> 
>>
>> Looking at the text of the LGPL (see COPYING.LIB in the top directory),
>> the license clearly states how this should be done instead:
>>
>> "3. You may opt to apply the terms of the ordinary GNU General Public
>>  License instead of this License to a given copy of the Library. To do
>>  this, you must alter all the notices that refer to this License, so
>>  that they refer to the ordinary GNU General Public License, version 2,
>>  instead of to this License."
> 
> Hm. This talks about GPL v2, not GPL v2-or-later...

IANAL, but since all the files originally were licensed under
LGPLv2-or-later, that should not be an issue, as far as I can see: You
then could also upgrade the LGPLv2-or-later code to LGPLv3-or-later,
which in turn allows you to license under GPLv3. So LGPLv2-or-later
means you can put the code also under GPLv2-or-later. Or do I miss
something?

 Thomas

Re: [Qemu-devel] [PATCH] s390x: Fix the confusing contributions-after-2012 license statements
Posted by Cornelia Huck 5 years, 1 month ago
On Wed, 6 Feb 2019 14:09:40 +0100
Thomas Huth <thuth@redhat.com> wrote:

> On 2019-02-06 13:58, Cornelia Huck wrote:
> > On Wed,  6 Feb 2019 13:41:33 +0100
> > Thomas Huth <thuth@redhat.com> wrote:
> >   
> >> The license information in these files is rather confusing. The text
> >> declares LGPL first, but then says that contributions after 2012 are
> >> licensed under the GPL instead. How should the average user who just
> >> downloaded the release tarball know which part is now GPL and which
> >> is LGPL?  
> > 
> > FWIW, that statement was added in ccb084d3f0ec ("s390: new
> > contributions GPLv2 or later").
> >   
> >>
> >> Looking at the text of the LGPL (see COPYING.LIB in the top directory),
> >> the license clearly states how this should be done instead:
> >>
> >> "3. You may opt to apply the terms of the ordinary GNU General Public
> >>  License instead of this License to a given copy of the Library. To do
> >>  this, you must alter all the notices that refer to this License, so
> >>  that they refer to the ordinary GNU General Public License, version 2,
> >>  instead of to this License."  
> > 
> > Hm. This talks about GPL v2, not GPL v2-or-later...  
> 
> IANAL, but since all the files originally were licensed under
> LGPLv2-or-later, that should not be an issue, as far as I can see: You
> then could also upgrade the LGPLv2-or-later code to LGPLv3-or-later,
> which in turn allows you to license under GPLv3. So LGPLv2-or-later
> means you can put the code also under GPLv2-or-later. Or do I miss
> something?

That would seem logical, but IANAL, either...

Anyway, I'd be happy to queue this if I get acks :)

Re: [Qemu-devel] [PATCH] s390x: Fix the confusing contributions-after-2012 license statements
Posted by Laurent Vivier 5 years, 1 month ago
On 06/02/2019 14:15, Cornelia Huck wrote:
> On Wed, 6 Feb 2019 14:09:40 +0100
> Thomas Huth <thuth@redhat.com> wrote:
> 
>> On 2019-02-06 13:58, Cornelia Huck wrote:
>>> On Wed,  6 Feb 2019 13:41:33 +0100
>>> Thomas Huth <thuth@redhat.com> wrote:
>>>   
>>>> The license information in these files is rather confusing. The text
>>>> declares LGPL first, but then says that contributions after 2012 are
>>>> licensed under the GPL instead. How should the average user who just
>>>> downloaded the release tarball know which part is now GPL and which
>>>> is LGPL?  
>>>
>>> FWIW, that statement was added in ccb084d3f0ec ("s390: new
>>> contributions GPLv2 or later").
>>>   
>>>>
>>>> Looking at the text of the LGPL (see COPYING.LIB in the top directory),
>>>> the license clearly states how this should be done instead:
>>>>
>>>> "3. You may opt to apply the terms of the ordinary GNU General Public
>>>>  License instead of this License to a given copy of the Library. To do
>>>>  this, you must alter all the notices that refer to this License, so
>>>>  that they refer to the ordinary GNU General Public License, version 2,
>>>>  instead of to this License."  
>>>
>>> Hm. This talks about GPL v2, not GPL v2-or-later...  
>>
>> IANAL, but since all the files originally were licensed under
>> LGPLv2-or-later, that should not be an issue, as far as I can see: You
>> then could also upgrade the LGPLv2-or-later code to LGPLv3-or-later,
>> which in turn allows you to license under GPLv3. So LGPLv2-or-later
>> means you can put the code also under GPLv2-or-later. Or do I miss
>> something?
> 
> That would seem logical, but IANAL, either...
> 
> Anyway, I'd be happy to queue this if I get acks :)
> 

For the linux-user part:

Acked-by: Laurent Vivier <laurent@vivier.eu>


Re: [Qemu-devel] [PATCH] s390x: Fix the confusing contributions-after-2012 license statements
Posted by Cornelia Huck 5 years, 1 month ago
On Wed,  6 Feb 2019 13:41:33 +0100
Thomas Huth <thuth@redhat.com> wrote:

> The license information in these files is rather confusing. The text
> declares LGPL first, but then says that contributions after 2012 are
> licensed under the GPL instead. How should the average user who just
> downloaded the release tarball know which part is now GPL and which
> is LGPL?
> 
> Looking at the text of the LGPL (see COPYING.LIB in the top directory),
> the license clearly states how this should be done instead:
> 
> "3. You may opt to apply the terms of the ordinary GNU General Public
>  License instead of this License to a given copy of the Library. To do
>  this, you must alter all the notices that refer to this License, so
>  that they refer to the ordinary GNU General Public License, version 2,
>  instead of to this License."
> 
> Thus let's clean up the confusing statements and use the proper GPL
> text only.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  linux-user/s390x/target_cpu.h | 19 ++++++++-----------
>  target/s390x/cpu.c            | 19 ++++++++-----------
>  target/s390x/cpu.h            | 19 ++++++++-----------
>  target/s390x/kvm.c            | 19 ++++++++-----------
>  4 files changed, 32 insertions(+), 44 deletions(-)

Thanks, applied.

Re: [Qemu-devel] [qemu-s390x] [PATCH] s390x: Fix the confusing contributions-after-2012 license statements
Posted by Christian Borntraeger 5 years, 1 month ago

On 06.02.2019 13:41, Thomas Huth wrote:
> The license information in these files is rather confusing. The text
> declares LGPL first, but then says that contributions after 2012 are
> licensed under the GPL instead. How should the average user who just
> downloaded the release tarball know which part is now GPL and which
> is LGPL?
> 
> Looking at the text of the LGPL (see COPYING.LIB in the top directory),
> the license clearly states how this should be done instead:
> 
> "3. You may opt to apply the terms of the ordinary GNU General Public
>  License instead of this License to a given copy of the Library. To do
>  this, you must alter all the notices that refer to this License, so
>  that they refer to the ordinary GNU General Public License, version 2,
>  instead of to this License."
> 
> Thus let's clean up the confusing statements and use the proper GPL
> text only.

For the IBM-provided parts GPLv2+ is fine.
Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>

> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  linux-user/s390x/target_cpu.h | 19 ++++++++-----------
>  target/s390x/cpu.c            | 19 ++++++++-----------
>  target/s390x/cpu.h            | 19 ++++++++-----------
>  target/s390x/kvm.c            | 19 ++++++++-----------
>  4 files changed, 32 insertions(+), 44 deletions(-)
> 
> diff --git a/linux-user/s390x/target_cpu.h b/linux-user/s390x/target_cpu.h
> index 66ef8aa..aa181ce 100644
> --- a/linux-user/s390x/target_cpu.h
> +++ b/linux-user/s390x/target_cpu.h
> @@ -3,21 +3,18 @@
>   *
>   * Copyright (c) 2009 Ulrich Hecht
>   *
> - * 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 program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU 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,
> + * This program 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.
> + * General Public License for more details.
>   *
> - * Contributions after 2012-10-29 are licensed under the terms of the
> - * GNU GPL, version 2 or (at your option) any later version.
> - *
> - * 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/>.
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, see <http://www.gnu.org/licenses/>.
>   */
>  #ifndef S390X_TARGET_CPU_H
>  #define S390X_TARGET_CPU_H
> diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c
> index 18ba7f8..698dd9c 100644
> --- a/target/s390x/cpu.c
> +++ b/target/s390x/cpu.c
> @@ -6,21 +6,18 @@
>   * Copyright (c) 2012 SUSE LINUX Products GmbH
>   * Copyright (c) 2012 IBM Corp.
>   *
> - * 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.1 of the License, or (at your option) any later version.
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU 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,
> + * This program 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.
> + * 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/lgpl-2.1.html>
> - * Contributions after 2012-12-11 are licensed under the terms of the
> - * GNU GPL, version 2 or (at your option) any later version.
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, see <http://www.gnu.org/licenses/>.
>   */
>  
>  #include "qemu/osdep.h"
> diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h
> index 47d2c2e..b71ac51 100644
> --- a/target/s390x/cpu.h
> +++ b/target/s390x/cpu.h
> @@ -4,21 +4,18 @@
>   *  Copyright (c) 2009 Ulrich Hecht
>   *  Copyright IBM Corp. 2012, 2018
>   *
> - * 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 program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU 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,
> + * This program 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.
> + * General Public License for more details.
>   *
> - * Contributions after 2012-10-29 are licensed under the terms of the
> - * GNU GPL, version 2 or (at your option) any later version.
> - *
> - * 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/>.
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, see <http://www.gnu.org/licenses/>.
>   */
>  
>  #ifndef S390X_CPU_H
> diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c
> index 8613e19..9ff80c8 100644
> --- a/target/s390x/kvm.c
> +++ b/target/s390x/kvm.c
> @@ -4,21 +4,18 @@
>   * Copyright (c) 2009 Alexander Graf <agraf@suse.de>
>   * Copyright IBM Corp. 2012
>   *
> - * 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 program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU 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,
> + * This program 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.
> + * General Public License for more details.
>   *
> - * Contributions after 2012-10-29 are licensed under the terms of the
> - * GNU GPL, version 2 or (at your option) any later version.
> - *
> - * 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/>.
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, see <http://www.gnu.org/licenses/>.
>   */
>  
>  #include "qemu/osdep.h"
>