[Qemu-devel] [PATCH 0/1] s390 files gplv2 or later

[Qemu-devel] [PATCH 0/1] s390 files gplv2 or later

[Christian Borntraeger]

IBMs s390 contributions were meant to to be gplv2 or later (since
we were contributing to qemu). Several of the s390 specific files
link to gpl code anyway so the ones in qemu repository will have
a hard time being strictly LGPL.
So lets clarify the licence statement for new contributions for 
those files that we have touched multiple times or will likely 
touch again.

Since we contributed only to KVM, this patch does not touch files
that mostly deal with tcg. Please tell me if I should do that for
the full target-s390x tree.

The alternative would be to change the licence directly (no
contributions after but a 1:1 replacement) for the files in the
qemu repository. But that would require an agreement of all
contributors due to "v2" vs "v2 or later". Opinions?

Christian Borntraeger (1):
  s390: new contributions GPLv2 or later

 target-s390x/cpu.h |    5 ++++-
 target-s390x/kvm.c |    6 +++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

-- 
1.7.10.1

[Qemu-devel] [PATCH 1/1] s390: new contributions GPLv2 or later

[Christian Borntraeger]

IBMs s390 contributions were meant to to be gplv2 or later (since
we were contributing to qemu). Several of the s390 specific files
link to gpl code anyway, so lets clarify the licence statement for
new contributions for those files that we have touched multiple
times or will likely touch again.

This patch does not touch files that mostly deal with tcg.

Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
---
 target-s390x/cpu.h |    5 ++++-
 target-s390x/kvm.c |    6 +++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/target-s390x/cpu.h b/target-s390x/cpu.h
index 0f9a1f7..1ceb71e 100644
--- a/target-s390x/cpu.h
+++ b/target-s390x/cpu.h
@@ -13,7 +13,10 @@
  * 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
+ * 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/>.
  */
 #ifndef CPU_S390X_H
diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c
index 94de764..99a72b0 100644
--- a/target-s390x/kvm.c
+++ b/target-s390x/kvm.c
@@ -2,6 +2,7 @@
  * QEMU S390x KVM implementation
  *
  * Copyright (c) 2009 Alexander Graf <agraf@suse.de>
+ * Copyright IBM Corp. 2011
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -13,7 +14,10 @@
  * 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
+ * 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/>.
  */
 
-- 
1.7.10.1

Re: [Qemu-devel] [PATCH 1/1] s390: new contributions GPLv2 or later

[Christian Borntraeger]

> --- a/target-s390x/kvm.c
> +++ b/target-s390x/kvm.c
> @@ -2,6 +2,7 @@
>   * QEMU S390x KVM implementation
>   *
>   * Copyright (c) 2009 Alexander Graf <agraf@suse.de>
> + * Copyright IBM Corp. 2011

Arg. Should have been 2012.

Re: [Qemu-devel] [PATCH 0/1] s390 files gplv2 or later

[Alexander Graf]

On 12.11.2012, at 12:44, Christian Borntraeger wrote:

> IBMs s390 contributions were meant to to be gplv2 or later (since
> we were contributing to qemu). Several of the s390 specific files
> link to gpl code anyway so the ones in qemu repository will have
> a hard time being strictly LGPL.
> So lets clarify the licence statement for new contributions for 
> those files that we have touched multiple times or will likely 
> touch again.
> 
> Since we contributed only to KVM, this patch does not touch files
> that mostly deal with tcg. Please tell me if I should do that for
> the full target-s390x tree.
> 
> The alternative would be to change the licence directly (no
> contributions after but a 1:1 replacement) for the files in the
> qemu repository. But that would require an agreement of all
> contributors due to "v2" vs "v2 or later". Opinions?

Given that GPLv2 only code is compatible with LGPLv2+, can't you just declare all IBM s390x code to be GPLv2 only? Then the rest should solve itself automatically, no? But then again, I'm not a lawyer :).


Alex

Re: [Qemu-devel] [PATCH 0/1] s390 files gplv2 or later

[Paolo Bonzini]

Il 19/11/2012 18:31, Alexander Graf ha scritto:
> Given that GPLv2 only code is compatible with LGPLv2+, can't you just
> declare all IBM s390x code to be GPLv2 only?

What Christian did matches what we have done for all files, so I'd
prefer that.

Paolo

> Then the rest should
> solve itself automatically, no? But then again, I'm not a lawyer :).

Re: [Qemu-devel] [PATCH 0/1] s390 files gplv2 or later

[Alexander Graf]

On 19.11.2012, at 19:17, Paolo Bonzini wrote:

> Il 19/11/2012 18:31, Alexander Graf ha scritto:
>> Given that GPLv2 only code is compatible with LGPLv2+, can't you just
>> declare all IBM s390x code to be GPLv2 only?
> 
> What Christian did matches what we have done for all files, so I'd
> prefer that.

Ah, ok :). I'll apply it then with fixed year.


Alex