[PATCH v2 0/4] tcg/LICENSE: Remove no-longer-true statement that TCG is BSD-licensed

[PATCH v2 0/4] tcg/LICENSE: Remove no-longer-true statement that TCG is BSD-licensed

[Peter Maydell]

Since 2008 the tcg/LICENSE file has not changed: it claims that
everything under tcg/ is BSD-licensed.

This is not true and hasn't been true for years: in 2013 we
accepted the tcg/aarch64 target code under a GPLv2-or-later
license statement. We also have generic vector optimisation
code under the LGPL2.1-or-later, and the TCI backend is
GPLv2-or-later. Further, many of the files are not BSD
licensed but MIT licensed.

We don't really consider the tcg subdirectory to be a distinct
part of QEMU anyway.

This patchset adds explicit licensing/copyright comments to
the three files which were missing them, removes the
inaccurate tcg/LICENSE file, and updates the top-level
LICENSE file to be more accurate about the current state
of the licenses used in the code in tcg/.

If we want a policy that tcg/ code has a restricted
permitted set of licenses, then we really need to have
this enforced by checkpatch -- history demonstrates that
just writing it in tcg/LICENSE does not prevent code under
other licenses getting in. In the v1 email thread nobody
seemed to be very strongly arguing for this, though, and
at this point we would need to make an active effort to
track down contributors and get relicensing statements.
If anybody wants to push that effort now would be a good
time to volunteer :-)

Note on the licensing for the tcg-target.opc.h files:
 * I've used the same license as the rest of the relevant
   backend, which is to say GPL2-or-later for tcg/aarch64
   and MIT for tcg/i386 and tcg/ppc.
 * In all 3 cases, the only people who've made contributions
   to the files are Richard Henderson and (for aarch64) Alex Bennée

Richard, Alex -- an acked-by for the relevant patches would
be nice (or if you intended a different license for the
contributions than I have assumed please say so!)

v1->v2 changes:
 * note the presence of MIT licensed code as well
 * 3 new patches adding copyright/licensing to files
   that were missing it

thanks
-- PMM

Peter Maydell (4):
  tcg/aarch64/tcg-target.opc.h: Add copyright/license
  tcg/i386/tcg-target.opc.h: Add copyright/license
  tcg/ppc/tcg-target.opc.h: Add copyright/license
  tcg/LICENSE: Remove out of date claim about TCG subdirectory licensing

 tcg/aarch64/tcg-target.opc.h | 15 ++++++++++++---
 tcg/i386/tcg-target.opc.h    | 28 +++++++++++++++++++++++++---
 tcg/ppc/tcg-target.opc.h     | 20 ++++++++++++++++++++
 LICENSE                      |  5 +++--
 tcg/LICENSE                  |  3 ---
 5 files changed, 60 insertions(+), 11 deletions(-)
 delete mode 100644 tcg/LICENSE

-- 
2.20.1

[PATCH v2 1/4] tcg/aarch64/tcg-target.opc.h: Add copyright/license

[Peter Maydell]

Add the copyright/license boilerplate for target/aarch64/tcg-target.opc.h.
This file has only had two commits: 14e4c1e2355473ccb29
and 79525dfd08262d8, both by Linaro engineers.
The license is GPL-2-or-later, since that's what the
rest of tcg/aarch64 uses.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 tcg/aarch64/tcg-target.opc.h | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/tcg/aarch64/tcg-target.opc.h b/tcg/aarch64/tcg-target.opc.h
index 59e1d3f7f7d..26bfd9c4609 100644
--- a/tcg/aarch64/tcg-target.opc.h
+++ b/tcg/aarch64/tcg-target.opc.h
@@ -1,5 +1,14 @@
-/* Target-specific opcodes for host vector expansion.  These will be
-   emitted by tcg_expand_vec_op.  For those familiar with GCC internals,
-   consider these to be UNSPEC with names.  */
+/*
+ * Copyright (c) 2019 Linaro
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or
+ * (at your option) any later version.
+ *
+ * See the COPYING file in the top-level directory for details.
+ *
+ * Target-specific opcodes for host vector expansion.  These will be
+ * emitted by tcg_expand_vec_op.  For those familiar with GCC internals,
+ * consider these to be UNSPEC with names.
+ */
 
 DEF(aa64_sshl_vec, 1, 2, 0, IMPLVEC)
-- 
2.20.1

Re: [PATCH v2 1/4] tcg/aarch64/tcg-target.opc.h: Add copyright/license

[Alex Bennée]

Peter Maydell <peter.maydell@linaro.org> writes:

> Add the copyright/license boilerplate for target/aarch64/tcg-target.opc.h.
> This file has only had two commits: 14e4c1e2355473ccb29
> and 79525dfd08262d8, both by Linaro engineers.

Both in fact by the same Linaro engineer - I only reviewed them.

> The license is GPL-2-or-later, since that's what the
> rest of tcg/aarch64 uses.
>
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

> ---
>  tcg/aarch64/tcg-target.opc.h | 15 ++++++++++++---
>  1 file changed, 12 insertions(+), 3 deletions(-)
>
> diff --git a/tcg/aarch64/tcg-target.opc.h b/tcg/aarch64/tcg-target.opc.h
> index 59e1d3f7f7d..26bfd9c4609 100644
> --- a/tcg/aarch64/tcg-target.opc.h
> +++ b/tcg/aarch64/tcg-target.opc.h
> @@ -1,5 +1,14 @@
> -/* Target-specific opcodes for host vector expansion.  These will be
> -   emitted by tcg_expand_vec_op.  For those familiar with GCC internals,
> -   consider these to be UNSPEC with names.  */
> +/*
> + * Copyright (c) 2019 Linaro
> + *
> + * This work is licensed under the terms of the GNU GPL, version 2 or
> + * (at your option) any later version.
> + *
> + * See the COPYING file in the top-level directory for details.
> + *
> + * Target-specific opcodes for host vector expansion.  These will be
> + * emitted by tcg_expand_vec_op.  For those familiar with GCC internals,
> + * consider these to be UNSPEC with names.
> + */
>
>  DEF(aa64_sshl_vec, 1, 2, 0, IMPLVEC)


--
Alex Bennée

Re: [PATCH v2 1/4] tcg/aarch64/tcg-target.opc.h: Add copyright/license

[Peter Maydell]

On Fri, 25 Oct 2019 at 17:49, Alex Bennée <alex.bennee@linaro.org> wrote:
>
>
> Peter Maydell <peter.maydell@linaro.org> writes:
>
> > Add the copyright/license boilerplate for target/aarch64/tcg-target.opc.h.
> > This file has only had two commits: 14e4c1e2355473ccb29
> > and 79525dfd08262d8, both by Linaro engineers.
>
> Both in fact by the same Linaro engineer - I only reviewed them.

Oops, yes, I misread the git commit logs.

thanks
-- PMM

[PATCH v2 2/4] tcg/i386/tcg-target.opc.h: Add copyright/license

[Peter Maydell]

Add the copyright/license boilerplate for tcg/i386/tcg-target.opc.h.
This file has had only one commit, 770c2fc7bb70804a, by
a Linaro engineer.
The license is MIT, since that's what the rest of tcg/i386/ is.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 tcg/i386/tcg-target.opc.h | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/tcg/i386/tcg-target.opc.h b/tcg/i386/tcg-target.opc.h
index e5fa88ba258..1312941800e 100644
--- a/tcg/i386/tcg-target.opc.h
+++ b/tcg/i386/tcg-target.opc.h
@@ -1,6 +1,28 @@
-/* Target-specific opcodes for host vector expansion.  These will be
-   emitted by tcg_expand_vec_op.  For those familiar with GCC internals,
-   consider these to be UNSPEC with names.  */
+/*
+ * Copyright (c) 2019 Linaro
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * Target-specific opcodes for host vector expansion.  These will be
+ * emitted by tcg_expand_vec_op.  For those familiar with GCC internals,
+ * consider these to be UNSPEC with names.
+ */
 
 DEF(x86_shufps_vec, 1, 2, 1, IMPLVEC)
 DEF(x86_vpblendvb_vec, 1, 3, 0, IMPLVEC)
-- 
2.20.1

[PATCH v2 3/4] tcg/ppc/tcg-target.opc.h: Add copyright/license

[Peter Maydell]

Add the copyright/license boilerplate for tcg/i386/tcg-target.opc.h.
This file has had only two commits, 4b06c216826b7e4 and
d9897efa1fd3174ec, both by a Linaro engineer.
The license is MIT, since that's what the rest of tcg/ppc/ is.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 tcg/ppc/tcg-target.opc.h | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/tcg/ppc/tcg-target.opc.h b/tcg/ppc/tcg-target.opc.h
index db24a11987c..1373f77e82f 100644
--- a/tcg/ppc/tcg-target.opc.h
+++ b/tcg/ppc/tcg-target.opc.h
@@ -1,4 +1,24 @@
 /*
+ * Copyright (c) 2019 Linaro Limited
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
  * Target-specific opcodes for host vector expansion.  These will be
  * emitted by tcg_expand_vec_op.  For those familiar with GCC internals,
  * consider these to be UNSPEC with names.
-- 
2.20.1

[PATCH v2 4/4] tcg/LICENSE: Remove out of date claim about TCG subdirectory licensing

[Peter Maydell]

Since 2008 the tcg/LICENSE file has not changed: it claims that
everything under tcg/ is BSD-licensed.

This is not true and hasn't been true for years: in 2013 we
accepted the tcg/aarch64 target code under a GPLv2-or-later
license statement. We also have generic vector optimisation
code under the LGPL2.1-or-later, and the TCI backend is
GPLv2-or-later. Further, many of the files are not BSD
licensed but MIT licensed.

We don't really consider the tcg subdirectory to be a distinct part
of QEMU anyway.

Remove the LICENSE file, since claiming false information
about the license of the code is confusing.

Update the main project LICENSE file also to be clearer about
the licenses used by TCG.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
Changes v1->v2: changed wording of new para 3 in
top level LICENSE file, since I noticed that we actually
have a lot of MIT-licensed code in tcg/ too.
---
 LICENSE     | 5 +++--
 tcg/LICENSE | 3 ---
 2 files changed, 3 insertions(+), 5 deletions(-)
 delete mode 100644 tcg/LICENSE

diff --git a/LICENSE b/LICENSE
index 9389ba614f8..f19b018486a 100644
--- a/LICENSE
+++ b/LICENSE
@@ -18,8 +18,9 @@ As of July 2013, contributions under version 2 of the GNU General Public
 License (and no later version) are only accepted for the following files
 or directories: bsd-user/, linux-user/, hw/vfio/, hw/xen/xen_pt*.
 
-3) The Tiny Code Generator (TCG) is released under the BSD license
-   (see license headers in files).
+3) The Tiny Code Generator (TCG) is mostly under the BSD or MIT licenses;
+   but some parts may be GPLv2 or other licenses. Again, see the
+   specific licensing information in each source file.
 
 4) QEMU is a trademark of Fabrice Bellard.
 
diff --git a/tcg/LICENSE b/tcg/LICENSE
deleted file mode 100644
index be817fa1625..00000000000
--- a/tcg/LICENSE
+++ /dev/null
@@ -1,3 +0,0 @@
-All the files in this directory and subdirectories are released under
-a BSD like license (see header in each file). No other license is
-accepted.
-- 
2.20.1

Re: [PATCH v2 0/4] tcg/LICENSE: Remove no-longer-true statement that TCG is BSD-licensed

[Alexander Graf]

On 25.10.19 17:58, Peter Maydell wrote:
> Since 2008 the tcg/LICENSE file has not changed: it claims that
> everything under tcg/ is BSD-licensed.
>
> This is not true and hasn't been true for years: in 2013 we
> accepted the tcg/aarch64 target code under a GPLv2-or-later
> license statement. We also have generic vector optimisation
> code under the LGPL2.1-or-later, and the TCI backend is
> GPLv2-or-later. Further, many of the files are not BSD
> licensed but MIT licensed.
>
> We don't really consider the tcg subdirectory to be a distinct
> part of QEMU anyway.
>
> This patchset adds explicit licensing/copyright comments to
> the three files which were missing them, removes the
> inaccurate tcg/LICENSE file, and updates the top-level
> LICENSE file to be more accurate about the current state
> of the licenses used in the code in tcg/.
>
> If we want a policy that tcg/ code has a restricted
> permitted set of licenses, then we really need to have
> this enforced by checkpatch -- history demonstrates that
> just writing it in tcg/LICENSE does not prevent code under
> other licenses getting in. In the v1 email thread nobody
> seemed to be very strongly arguing for this, though, and
> at this point we would need to make an active effort to
> track down contributors and get relicensing statements.
> If anybody wants to push that effort now would be a good
> time to volunteer :-)
>
> Note on the licensing for the tcg-target.opc.h files:
>   * I've used the same license as the rest of the relevant
>     backend, which is to say GPL2-or-later for tcg/aarch64
>     and MIT for tcg/i386 and tcg/ppc.
>   * In all 3 cases, the only people who've made contributions
>     to the files are Richard Henderson and (for aarch64) Alex Bennée
>
> Richard, Alex -- an acked-by for the relevant patches would
> be nice (or if you intended a different license for the
> contributions than I have assumed please say so!)


Thanks for cleaning up the license mess :)

Reviewed-by: Alexander Graf <agraf@csgraf.de>

Alex

Re: [PATCH v2 0/4] tcg/LICENSE: Remove no-longer-true statement that TCG is BSD-licensed

[Richard Henderson]

On 10/25/19 11:58 AM, Peter Maydell wrote:
> Since 2008 the tcg/LICENSE file has not changed: it claims that
> everything under tcg/ is BSD-licensed.
> 
> This is not true and hasn't been true for years: in 2013 we
> accepted the tcg/aarch64 target code under a GPLv2-or-later
> license statement. We also have generic vector optimisation
> code under the LGPL2.1-or-later, and the TCI backend is
> GPLv2-or-later. Further, many of the files are not BSD
> licensed but MIT licensed.
> 
> We don't really consider the tcg subdirectory to be a distinct
> part of QEMU anyway.
> 
> This patchset adds explicit licensing/copyright comments to
> the three files which were missing them, removes the
> inaccurate tcg/LICENSE file, and updates the top-level
> LICENSE file to be more accurate about the current state
> of the licenses used in the code in tcg/.
> 
> If we want a policy that tcg/ code has a restricted
> permitted set of licenses, then we really need to have
> this enforced by checkpatch -- history demonstrates that
> just writing it in tcg/LICENSE does not prevent code under
> other licenses getting in. In the v1 email thread nobody
> seemed to be very strongly arguing for this, though, and
> at this point we would need to make an active effort to
> track down contributors and get relicensing statements.
> If anybody wants to push that effort now would be a good
> time to volunteer :-)
> 
> Note on the licensing for the tcg-target.opc.h files:
>  * I've used the same license as the rest of the relevant
>    backend, which is to say GPL2-or-later for tcg/aarch64
>    and MIT for tcg/i386 and tcg/ppc.
>  * In all 3 cases, the only people who've made contributions
>    to the files are Richard Henderson and (for aarch64) Alex Bennée
> 
> Richard, Alex -- an acked-by for the relevant patches would
> be nice (or if you intended a different license for the
> contributions than I have assumed please say so!)

No, I had no intention to put things under a different license.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

for the lot.  Since I'm having to re-spin the last tcg pull for a win32
failure, I'll include this as well.


r~

Re: [PATCH v2 0/4] tcg/LICENSE: Remove no-longer-true statement that TCG is BSD-licensed

[Richard Henderson]

On 10/25/19 5:58 PM, Peter Maydell wrote:
> Since 2008 the tcg/LICENSE file has not changed: it claims that
> everything under tcg/ is BSD-licensed.
> 
> This is not true and hasn't been true for years: in 2013 we
> accepted the tcg/aarch64 target code under a GPLv2-or-later
> license statement. We also have generic vector optimisation
> code under the LGPL2.1-or-later, and the TCI backend is
> GPLv2-or-later. Further, many of the files are not BSD
> licensed but MIT licensed.
> 
> We don't really consider the tcg subdirectory to be a distinct
> part of QEMU anyway.
> 
> This patchset adds explicit licensing/copyright comments to
> the three files which were missing them, removes the
> inaccurate tcg/LICENSE file, and updates the top-level
> LICENSE file to be more accurate about the current state
> of the licenses used in the code in tcg/.
> 
> If we want a policy that tcg/ code has a restricted
> permitted set of licenses, then we really need to have
> this enforced by checkpatch -- history demonstrates that
> just writing it in tcg/LICENSE does not prevent code under
> other licenses getting in. In the v1 email thread nobody
> seemed to be very strongly arguing for this, though, and
> at this point we would need to make an active effort to
> track down contributors and get relicensing statements.
> If anybody wants to push that effort now would be a good
> time to volunteer :-)
> 
> Note on the licensing for the tcg-target.opc.h files:
>  * I've used the same license as the rest of the relevant
>    backend, which is to say GPL2-or-later for tcg/aarch64
>    and MIT for tcg/i386 and tcg/ppc.
>  * In all 3 cases, the only people who've made contributions
>    to the files are Richard Henderson and (for aarch64) Alex Bennée
> 
> Richard, Alex -- an acked-by for the relevant patches would
> be nice (or if you intended a different license for the
> contributions than I have assumed please say so!)
> 
> v1->v2 changes:
>  * note the presence of MIT licensed code as well
>  * 3 new patches adding copyright/licensing to files
>    that were missing it
> 
> thanks
> -- PMM
> 
> Peter Maydell (4):
>   tcg/aarch64/tcg-target.opc.h: Add copyright/license
>   tcg/i386/tcg-target.opc.h: Add copyright/license
>   tcg/ppc/tcg-target.opc.h: Add copyright/license
>   tcg/LICENSE: Remove out of date claim about TCG subdirectory licensing

Queued.


r~