[Qemu-devel] [PATCH 0/2] Clarify licensing terms

[Qemu-devel] [PATCH 0/2] Clarify licensing terms

[Paolo Bonzini]

Here is a list of license-less files:

       audio/audio_pt_int.c
       audio/audio_win_int.c
       audio/paaudio.c
       audio/wavcapture.c
       audio/winwaveaudio.c
       block/raw.c
       bsd-user/bsdload.c
       bsd-user/elfload.c
       bsd-user/strace.c
       bsd-user/uaccess.c
       disas.c
       fpu/softfloat.c
       hw/alpha/dp264.c
       hw/alpha/pci.c
       hw/block/tc58128.c
       hw/char/spapr_vty.c
       hw/core/qdev-properties.c
       hw/core/stream.c
       hw/i386/xen_domainbuild.c
       hw/mips/mips_r4k.c
       hw/net/mipsnet.c
       hw/pci/shpc.c
       hw/pci/slotid_cap.c
       hw/ppc/spapr_hcall.c
       hw/scsi/scsi-bus.c
       hw/sh4/sh7750_regnames.c
       hw/usb/bus.c
       hw/usb/desc.c
       hw/xen/xen_devconfig.c
       libcacard/vcardt.c
       linux-user/elfload.c
       linux-user/linuxload.c
       linux-user/strace.c
       linux-user/uaccess.c
       pc-bios/openbios-ppc
       qga/channel-posix.c
       qga/channel-win32.c
       spice-qemu-char.c
       stubs/arch-query-cpu-def.c
       stubs/clock-warp.c
       stubs/cpu-get-clock.c
       stubs/cpu-get-icount.c
       stubs/cpus.c
       stubs/fd-register.c
       stubs/fdset-add-fd.c
       stubs/fdset-find-fd.c
       stubs/fdset-get-fd.c
       stubs/fdset-remove-fd.c
       stubs/get-fd.c
       stubs/get-vm-name.c
       stubs/iothread-lock.c
       stubs/migr-blocker.c
       stubs/mon-is-qmp.c
       stubs/mon-print-filename.c
       stubs/mon-printf.c
       stubs/mon-protocol-event.c
       stubs/mon-set-error.c
       stubs/pci-drive-hot-add.c
       stubs/reset.c
       stubs/set-fd-handler.c
       stubs/slirp.c
       stubs/sysbus.c
       stubs/vm-stop.c
       stubs/vmstate.c
       target-alpha/machine.c
       target-arm/helper.c
       target-arm/machine.c
       target-cris/machine.c
       target-i386/machine.c
       target-lm32/machine.c
       target-lm32/op_helper.c
       target-mips/machine.c
       target-moxie/machine.c
       target-ppc/machine.c
       target-ppc/mfrom_table.c
       target-ppc/mfrom_table_gen.c
       target-sparc/machine.c
       trace/stderr.c
       ui/cursor.c
       util/cache-utils.c
       util/envlist.c
       util/path.c
       util/qemu-config.c

target-* probably should be LGPL.  Left for later if ever.

stubs/ probably should be BSD if it is copyrightable at all.  Left for
later.

block/raw.c should be BSD, see patch 1.

bsd-user/ and linux-user/ should be either GPLv2 or GPLv2+.  Any help
auditing is welcome.
 
Everything else is fine for GPLv2+.  Patch 2 states this explicitly.

Paolo Bonzini (2):
  raw: add license header
  LICENSE: clarify

 LICENSE     | 15 ++++++++++-----
 block/raw.c | 23 +++++++++++++++++++++++
 2 files changed, 33 insertions(+), 5 deletions(-)

-- 
1.8.1.4

[Qemu-devel] [PATCH 1/2] raw: add license header

[Paolo Bonzini]

Most of the block layer is under the BSD license, thus it is reasonable
to license block/raw.c the same way.  CCed people should ACK by replying
with a Signed-off-by line.

Cc: Christoph Hellwig <hch@lst.de>
Cc: Kevin Wolf <kwolf@redhat.com>
Cc: Anthony Liguori <aliguori@us.ibm.com>
Cc: Markus Armbruster <armbru@redhat.com>
Cc: Stefan Hajnoczi <stefanha@redhat.com>
Cc: Luiz Capitulino <lcapitulino@redhat.com>
Cc: Jeff Cody <jcody@redhat.com>
Cc: Peter Lieven <pl@kamp.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 block/raw.c | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/block/raw.c b/block/raw.c
index f1682d4..4751825 100644
--- a/block/raw.c
+++ b/block/raw.c
@@ -1,3 +1,26 @@
+/*
+ * Block driver for RAW format
+ *
+ * Copyright (c) 2006 Fabrice Bellard
+ *
+ * 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.
+ */
 
 #include "qemu-common.h"
 #include "block/block_int.h"
-- 
1.8.1.4

[Qemu-devel] [PATCH 2/2] LICENSE: clarify

[Paolo Bonzini]

1) The GPL says that "if the Program does not specify a version number
of this License, you may choose any version ever published by the Free
Software Foundation".  This is not true, QEMU includes parts that are
v2-only.

2) Provide a default for files with no licensing information.

3) It is not just hardware emulation that is under BSD license.

4) Restrict GPLv2-only contributions to user mode emulation (due to
code from Linux) and PCI passthrough (due to code from Neocleus).

5) The rules were initially set by Fabrice but are being amended by
other people (already in commit ee12e1f, LICENSE: There is no libqemu.a
anymore, 2011-11-15).  Do not put words in his mouth.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 LICENSE | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/LICENSE b/LICENSE
index acae9a3..2bd2e95 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,16 +1,21 @@
 The following points clarify the QEMU license:
 
-1) QEMU as a whole is released under the GNU General Public License
+1) QEMU as a whole is released under the GNU General Public License,
+version 2.
 
 2) Parts of QEMU have specific licenses which are compatible with the
-GNU General Public License. Hence each source file contains its own
-licensing information.
+GNU General Public License, version 2. Hence each source file contains
+its own licensing information.  Source files with no licensing information
+are released under the GNU General Public License, version 2 or (at your
+option) any later version.
 
-Many hardware device emulation sources are released under the BSD license.
+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/misc/vfio.c, hw/xen/xen_pt*.
 
 3) The Tiny Code Generator (TCG) is released under the BSD license
    (see license headers in files).
 
 4) QEMU is a trademark of Fabrice Bellard.
 
-Fabrice Bellard.
+Fabrice Bellard and the QEMU team
-- 
1.8.1.4

Re: [Qemu-devel] [PATCH 2/2] LICENSE: clarify

[Erik de Castro Lopo]

Paolo Bonzini wrote:

> 4) Restrict GPLv2-only contributions to user mode emulation (due to
> code from Linux) and PCI passthrough (due to code from Neocleus).

It would be nice to have that statement or something like it
mentioning the linux-user/ tree added to the LICENSE file.

Cheers,
Erik
-- 
----------------------------------------------------------------------
Erik de Castro Lopo
http://www.mega-nerd.com/

Re: [Qemu-devel] [PATCH 2/2] LICENSE: clarify

[Andreas Färber]

Am 31.07.2013 08:19, schrieb Paolo Bonzini:
> 1) The GPL says that "if the Program does not specify a version number
> of this License, you may choose any version ever published by the Free
> Software Foundation".  This is not true, QEMU includes parts that are
> v2-only.
> 
> 2) Provide a default for files with no licensing information.
> 
> 3) It is not just hardware emulation that is under BSD license.
> 
> 4) Restrict GPLv2-only contributions to user mode emulation (due to
> code from Linux) and PCI passthrough (due to code from Neocleus).
> 
> 5) The rules were initially set by Fabrice but are being amended by
> other people (already in commit ee12e1f, LICENSE: There is no libqemu.a
> anymore, 2011-11-15).  Do not put words in his mouth.
> 
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

Acked-by: Andreas Färber <afaerber@suse.de>

Thanks,
Andreas

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

Re: [Qemu-devel] [PATCH 1/2] raw: add license header

[Kevin Wolf]

Am 31.07.2013 um 08:19 hat Paolo Bonzini geschrieben:
> Most of the block layer is under the BSD license, thus it is reasonable
> to license block/raw.c the same way.  CCed people should ACK by replying
> with a Signed-off-by line.
> 
> Cc: Christoph Hellwig <hch@lst.de>
> Cc: Kevin Wolf <kwolf@redhat.com>
> Cc: Anthony Liguori <aliguori@us.ibm.com>
> Cc: Markus Armbruster <armbru@redhat.com>
> Cc: Stefan Hajnoczi <stefanha@redhat.com>
> Cc: Luiz Capitulino <lcapitulino@redhat.com>
> Cc: Jeff Cody <jcody@redhat.com>
> Cc: Peter Lieven <pl@kamp.de>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

Thanks, Paolo, for taking the effort to clarify the license.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>

>  block/raw.c | 23 +++++++++++++++++++++++
>  1 file changed, 23 insertions(+)
> 
> diff --git a/block/raw.c b/block/raw.c
> index f1682d4..4751825 100644
> --- a/block/raw.c
> +++ b/block/raw.c
> @@ -1,3 +1,26 @@
> +/*
> + * Block driver for RAW format
> + *
> + * Copyright (c) 2006 Fabrice Bellard

This part of the code is actually something that Fabrice never touched
(and consequently you didn't CC him either). This should probably refer
to Christoph instead or include all of the people who contributed to the
file.

Kevin

Re: [Qemu-devel] [PATCH 1/2] raw: add license header

[Markus Armbruster]

Paolo Bonzini <pbonzini@redhat.com> writes:

> Most of the block layer is under the BSD license, thus it is reasonable
> to license block/raw.c the same way.  CCed people should ACK by replying
> with a Signed-off-by line.
>
> Cc: Christoph Hellwig <hch@lst.de>
> Cc: Kevin Wolf <kwolf@redhat.com>
> Cc: Anthony Liguori <aliguori@us.ibm.com>
> Cc: Markus Armbruster <armbru@redhat.com>
> Cc: Stefan Hajnoczi <stefanha@redhat.com>
> Cc: Luiz Capitulino <lcapitulino@redhat.com>
> Cc: Jeff Cody <jcody@redhat.com>
> Cc: Peter Lieven <pl@kamp.de>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

In general, I very much prefer to protect my work with a strong copyleft
license like the GPLv2+.  However, my contributions to raw.c are
trivial, so I choose to go with the flow in this case.

Signed-off-by: Markus Armbruster <armbru@redhat.com>

Re: [Qemu-devel] [PATCH 1/2] raw: add license header

[Stefan Hajnoczi]

On Wed, Jul 31, 2013 at 08:19:51AM +0200, Paolo Bonzini wrote:
> Most of the block layer is under the BSD license, thus it is reasonable
> to license block/raw.c the same way.  CCed people should ACK by replying
> with a Signed-off-by line.
> 
> Cc: Christoph Hellwig <hch@lst.de>
> Cc: Kevin Wolf <kwolf@redhat.com>
> Cc: Anthony Liguori <aliguori@us.ibm.com>
> Cc: Markus Armbruster <armbru@redhat.com>
> Cc: Stefan Hajnoczi <stefanha@redhat.com>

I switched employers since my block/raw.c contributions, but FWIW:

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>

Re: [Qemu-devel] [PATCH 1/2] raw: add license header

[Jeff Cody]

On Wed, Jul 31, 2013 at 08:19:51AM +0200, Paolo Bonzini wrote:
> Most of the block layer is under the BSD license, thus it is reasonable
> to license block/raw.c the same way.  CCed people should ACK by replying
> with a Signed-off-by line.
> 
> Cc: Christoph Hellwig <hch@lst.de>
> Cc: Kevin Wolf <kwolf@redhat.com>
> Cc: Anthony Liguori <aliguori@us.ibm.com>
> Cc: Markus Armbruster <armbru@redhat.com>
> Cc: Stefan Hajnoczi <stefanha@redhat.com>
> Cc: Luiz Capitulino <lcapitulino@redhat.com>
> Cc: Jeff Cody <jcody@redhat.com>

Signed-off-by: Jeff Cody <jcody@redhat.com>


> Cc: Peter Lieven <pl@kamp.de>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  block/raw.c | 23 +++++++++++++++++++++++
>  1 file changed, 23 insertions(+)
> 
> diff --git a/block/raw.c b/block/raw.c
> index f1682d4..4751825 100644
> --- a/block/raw.c
> +++ b/block/raw.c
> @@ -1,3 +1,26 @@
> +/*
> + * Block driver for RAW format
> + *
> + * Copyright (c) 2006 Fabrice Bellard
> + *
> + * 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.
> + */
>  
>  #include "qemu-common.h"
>  #include "block/block_int.h"
> -- 
> 1.8.1.4
> 
> 
> 

Re: [Qemu-devel] [PATCH 1/2] raw: add license header

[Luiz Capitulino]

On Wed, 31 Jul 2013 08:19:51 +0200
Paolo Bonzini <pbonzini@redhat.com> wrote:

> Most of the block layer is under the BSD license, thus it is reasonable
> to license block/raw.c the same way.  CCed people should ACK by replying
> with a Signed-off-by line.
> 
> Cc: Christoph Hellwig <hch@lst.de>
> Cc: Kevin Wolf <kwolf@redhat.com>
> Cc: Anthony Liguori <aliguori@us.ibm.com>
> Cc: Markus Armbruster <armbru@redhat.com>
> Cc: Stefan Hajnoczi <stefanha@redhat.com>
> Cc: Luiz Capitulino <lcapitulino@redhat.com>
> Cc: Jeff Cody <jcody@redhat.com>
> Cc: Peter Lieven <pl@kamp.de>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  block/raw.c | 23 +++++++++++++++++++++++
>  1 file changed, 23 insertions(+)

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>

> 
> diff --git a/block/raw.c b/block/raw.c
> index f1682d4..4751825 100644
> --- a/block/raw.c
> +++ b/block/raw.c
> @@ -1,3 +1,26 @@
> +/*
> + * Block driver for RAW format
> + *
> + * Copyright (c) 2006 Fabrice Bellard
> + *
> + * 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.
> + */
>  
>  #include "qemu-common.h"
>  #include "block/block_int.h"

Re: [Qemu-devel] [PATCH 0/2] Clarify licensing terms

[Artyom Tarasenko]

Hi Paolo,

On Wed, Jul 31, 2013 at 8:19 AM, Paolo Bonzini <pbonzini@redhat.com> wrote:
> Here is a list of license-less files:
>
>        audio/audio_pt_int.c
>        audio/audio_win_int.c
>        audio/paaudio.c
>        audio/wavcapture.c
>        audio/winwaveaudio.c
>        block/raw.c
>        bsd-user/bsdload.c
>        bsd-user/elfload.c
>        bsd-user/strace.c
>        bsd-user/uaccess.c
>        disas.c
>        fpu/softfloat.c
>        hw/alpha/dp264.c
>        hw/alpha/pci.c
>        hw/block/tc58128.c
>        hw/char/spapr_vty.c
>        hw/core/qdev-properties.c
>        hw/core/stream.c
>        hw/i386/xen_domainbuild.c
>        hw/mips/mips_r4k.c
>        hw/net/mipsnet.c
>        hw/pci/shpc.c
>        hw/pci/slotid_cap.c
>        hw/ppc/spapr_hcall.c
>        hw/scsi/scsi-bus.c
>        hw/sh4/sh7750_regnames.c
>        hw/usb/bus.c
>        hw/usb/desc.c
>        hw/xen/xen_devconfig.c
>        libcacard/vcardt.c
>        linux-user/elfload.c
>        linux-user/linuxload.c
>        linux-user/strace.c
>        linux-user/uaccess.c
>        pc-bios/openbios-ppc
>        qga/channel-posix.c
>        qga/channel-win32.c
>        spice-qemu-char.c
>        stubs/arch-query-cpu-def.c
>        stubs/clock-warp.c
>        stubs/cpu-get-clock.c
>        stubs/cpu-get-icount.c
>        stubs/cpus.c
>        stubs/fd-register.c
>        stubs/fdset-add-fd.c
>        stubs/fdset-find-fd.c
>        stubs/fdset-get-fd.c
>        stubs/fdset-remove-fd.c
>        stubs/get-fd.c
>        stubs/get-vm-name.c
>        stubs/iothread-lock.c
>        stubs/migr-blocker.c
>        stubs/mon-is-qmp.c
>        stubs/mon-print-filename.c
>        stubs/mon-printf.c
>        stubs/mon-protocol-event.c
>        stubs/mon-set-error.c
>        stubs/pci-drive-hot-add.c
>        stubs/reset.c
>        stubs/set-fd-handler.c
>        stubs/slirp.c
>        stubs/sysbus.c
>        stubs/vm-stop.c
>        stubs/vmstate.c
>        target-alpha/machine.c
>        target-arm/helper.c
>        target-arm/machine.c
>        target-cris/machine.c
>        target-i386/machine.c
>        target-lm32/machine.c
>        target-lm32/op_helper.c
>        target-mips/machine.c
>        target-moxie/machine.c
>        target-ppc/machine.c
>        target-ppc/mfrom_table.c
>        target-ppc/mfrom_table_gen.c
>        target-sparc/machine.c
>        trace/stderr.c
>        ui/cursor.c
>        util/cache-utils.c
>        util/envlist.c
>        util/path.c
>        util/qemu-config.c
>
> target-* probably should be LGPL.  Left for later if ever.

At least target-sparc/machine.c is coming from vl.c, so it must be BSD.


Artyom

-- 
Regards,
Artyom Tarasenko

linux/sparc and solaris/sparc under qemu blog:
http://tyom.blogspot.com/search/label/qemu

Re: [Qemu-devel] [PATCH 2/2] LICENSE: clarify

[Stefan Weil]

Am 31.07.2013 08:19, schrieb Paolo Bonzini:
> 1) The GPL says that "if the Program does not specify a version number
> of this License, you may choose any version ever published by the Free
> Software Foundation".  This is not true, QEMU includes parts that are
> v2-only.
>
> 2) Provide a default for files with no licensing information.
>
> 3) It is not just hardware emulation that is under BSD license.
>
> 4) Restrict GPLv2-only contributions to user mode emulation (due to
> code from Linux) and PCI passthrough (due to code from Neocleus).
>
> 5) The rules were initially set by Fabrice but are being amended by
> other people (already in commit ee12e1f, LICENSE: There is no libqemu.a
> anymore, 2011-11-15).  Do not put words in his mouth.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  LICENSE | 15 ++++++++++-----
>  1 file changed, 10 insertions(+), 5 deletions(-)
>
> diff --git a/LICENSE b/LICENSE
> index acae9a3..2bd2e95 100644
> --- a/LICENSE
> +++ b/LICENSE
> @@ -1,16 +1,21 @@
>  The following points clarify the QEMU license:
>  
> -1) QEMU as a whole is released under the GNU General Public License
> +1) QEMU as a whole is released under the GNU General Public License,
> +version 2.

I appreciate these clarifications. For point 1, I suggest

... version 2 or (at your option) any later version.

That is more precise because it excludes "version 2 only"
and corresponds better to file COPYING.

Maybe we can also refer to the files COPYING and COPYING.LIB.


>  
>  2) Parts of QEMU have specific licenses which are compatible with the
> -GNU General Public License. Hence each source file contains its own
> -licensing information.
> +GNU General Public License, version 2. Hence each source file contains
> +its own licensing information.  Source files with no licensing information
> +are released under the GNU General Public License, version 2 or (at your
> +option) any later version.
>  
> -Many hardware device emulation sources are released under the BSD license.
> +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/misc/vfio.c, hw/xen/xen_pt*.
>  
>  3) The Tiny Code Generator (TCG) is released under the BSD license
>     (see license headers in files).
>  
>  4) QEMU is a trademark of Fabrice Bellard.
>  
> -Fabrice Bellard.
> +Fabrice Bellard and the QEMU team

"QEMU team" is rather unspecific. Who is member of the QEMU team?

* People with commit rights?
* All maintainers listed in MAINTAINERS?
* Participants of the KVM calls?
* QEMU contributors working for Redhat, IBM, SUSE?
* All contributors?

Fabrice Bellard and all QEMU contributors would be more specific.

The trademark ownership is another problem - not now,
but maybe in 60 years (for obvious reasons).

What about transfering it to FSF Europe or some other
organisation? Of course this needs discussion with Fabrice,
so this can be postponed for the time after QEMU 1.6.

Regards,

Stefan

Re: [Qemu-devel] [PATCH 2/2] LICENSE: clarify

[Eric Blake]

[-- Attachment #1: Type: text/plain, Size: 1668 bytes --]

On 07/31/2013 10:48 AM, Stefan Weil wrote:

>>  
>> -1) QEMU as a whole is released under the GNU General Public License
>> +1) QEMU as a whole is released under the GNU General Public License,
>> +version 2.
> 
> I appreciate these clarifications. For point 1, I suggest
> 
> ... version 2 or (at your option) any later version.
> 
> That is more precise because it excludes "version 2 only"
> and corresponds better to file COPYING.

No.  qemu itself _is_ GPLv2-only, because it uses GPLv2-only code.  That
is, GPLv2-only is the only license compatible with the intersection of
all sources combined together to make the qemu binary.

There are individual files that can (at your option) be upgraded to a
later GPL version, but qemu itself can never be released under GPLv3
without a lot of relicensing work (and likely never to happen, given
that the kernel is the source of some of our GPLv2-only files, and the
kernel is unwilling to use GPLv2+).

[Side note - libvirt ships multiple binaries, where the license on those
binaries differs: libvirt.so is inentionally LGPLv2+; libvirtd is
LGPLv2-only, because that is the only license compatible in the
intersection of libvirt.so and its use of virtualbox code that is
LGPLv2-only; virsh is GPLv3+, because that is the only license
compatible in the intersection of libvirt.so and its use of GPLv3+ readline]

> 
> Maybe we can also refer to the files COPYING and COPYING.LIB.

Yes, that might be worthwhile to do.  (Technically, COPYING.LIB already
refers to COPYING)

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 621 bytes --]

Re: [Qemu-devel] [PATCH 2/2] LICENSE: clarify

[Anthony Liguori]

On Wed, Jul 31, 2013 at 1:19 AM, Paolo Bonzini <pbonzini@redhat.com> wrote:
> 1) The GPL says that "if the Program does not specify a version number
> of this License, you may choose any version ever published by the Free
> Software Foundation".  This is not true, QEMU includes parts that are
> v2-only.
>
> 2) Provide a default for files with no licensing information.
>
> 3) It is not just hardware emulation that is under BSD license.
>
> 4) Restrict GPLv2-only contributions to user mode emulation (due to
> code from Linux) and PCI passthrough (due to code from Neocleus).

I am okay *discouraging* GPLv2 only contributions but if there's
compelling code that cannot be relicensed, I would object strongly to
rejecting it purely because it wasn't GPLv2+.

>
> 5) The rules were initially set by Fabrice but are being amended by
> other people (already in commit ee12e1f, LICENSE: There is no libqemu.a
> anymore, 2011-11-15).  Do not put words in his mouth.

I think it's better at this point to just put QEMU team.  Fabrice is
no longer associated with the project.

Regards,

Anthony Liguori

> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  LICENSE | 15 ++++++++++-----
>  1 file changed, 10 insertions(+), 5 deletions(-)
>
> diff --git a/LICENSE b/LICENSE
> index acae9a3..2bd2e95 100644
> --- a/LICENSE
> +++ b/LICENSE
> @@ -1,16 +1,21 @@
>  The following points clarify the QEMU license:
>
> -1) QEMU as a whole is released under the GNU General Public License
> +1) QEMU as a whole is released under the GNU General Public License,
> +version 2.
>
>  2) Parts of QEMU have specific licenses which are compatible with the
> -GNU General Public License. Hence each source file contains its own
> -licensing information.
> +GNU General Public License, version 2. Hence each source file contains
> +its own licensing information.  Source files with no licensing information
> +are released under the GNU General Public License, version 2 or (at your
> +option) any later version.
>
> -Many hardware device emulation sources are released under the BSD license.
> +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/misc/vfio.c, hw/xen/xen_pt*.
>
>  3) The Tiny Code Generator (TCG) is released under the BSD license
>     (see license headers in files).
>
>  4) QEMU is a trademark of Fabrice Bellard.
>
> -Fabrice Bellard.
> +Fabrice Bellard and the QEMU team
> --
> 1.8.1.4
>
>

Re: [Qemu-devel] [PATCH 1/2] raw: add license header

[Christoph Hellwig]

On Wed, Jul 31, 2013 at 08:19:51AM +0200, Paolo Bonzini wrote:
> Most of the block layer is under the BSD license, thus it is reasonable
> to license block/raw.c the same way.  CCed people should ACK by replying
> with a Signed-off-by line.

The coded was intended to be GPLv2.

Re: [Qemu-devel] [PATCH 2/2] LICENSE: clarify

[Paolo Bonzini]

> On Wed, Jul 31, 2013 at 1:19 AM, Paolo Bonzini <pbonzini@redhat.com> wrote:
> > 1) The GPL says that "if the Program does not specify a version number
> > of this License, you may choose any version ever published by the Free
> > Software Foundation".  This is not true, QEMU includes parts that are
> > v2-only.
> >
> > 2) Provide a default for files with no licensing information.
> >
> > 3) It is not just hardware emulation that is under BSD license.
> >
> > 4) Restrict GPLv2-only contributions to user mode emulation (due to
> > code from Linux) and PCI passthrough (due to code from Neocleus).
> 
> I am okay *discouraging* GPLv2 only contributions but if there's
> compelling code that cannot be relicensed, I would object strongly to
> rejecting it purely because it wasn't GPLv2+.

Yes, that's why I included "as of".  We can certainly broaden the
set of GPLv2-only features, but it would require discussions and another
patch to LICENSE.  If you believe "as of July 2013" is not enough, I can
send v2.

> > 5) The rules were initially set by Fabrice but are being amended by
> > other people (already in commit ee12e1f, LICENSE: There is no libqemu.a
> > anymore, 2011-11-15).  Do not put words in his mouth.
> 
> I think it's better at this point to just put QEMU team.  Fabrice is
> no longer associated with the project.

It still mentions the trademark, and one of the last times he was
contacted was exactly to enforce the BSDness of TCG, so I left it in.
As the most active committer, you can certainly submit a follow-up
patch to remove it; I didn't really feel qualified to do that.

Paolo

Re: [Qemu-devel] [PATCH 2/2] LICENSE: clarify

[Paolo Bonzini]

> > -1) QEMU as a whole is released under the GNU General Public License
> > +1) QEMU as a whole is released under the GNU General Public License,
> > +version 2.
> 
> I appreciate these clarifications. For point 1, I suggest
> 
> ... version 2 or (at your option) any later version.

As Eric explained, I wish this was true! :)

I explained this in the commit message, too:
> > 1) The GPL says that "if the Program does not specify a version number
> > of this License, you may choose any version ever published by the Free
> > Software Foundation".  This is not true, QEMU includes parts that are
> > v2-only.

> > -Fabrice Bellard.
> > +Fabrice Bellard and the QEMU team
> 
> "QEMU team" is rather unspecific. Who is member of the QEMU team?
> 
> * People with commit rights?
> * All maintainers listed in MAINTAINERS?
> * Participants of the KVM calls?
> * QEMU contributors working for Redhat, IBM, SUSE?
> * All contributors?
> 
> Fabrice Bellard and all QEMU contributors would be more specific.

Certainly these rules have to be understood by committers, but QEMU
team is intended in the most generic sense.  It just means "people
who care about these rules"---everyone else agrees to them by providing
the Signed-off-by lines in their commit messages, and this includes
many from RH/IBM/SuSE.

"XYZ team" occurs frequently in copyright notices, and I don't think
the interpretation of it is going to be a problem.

Paolo

Re: [Qemu-devel] [PATCH 1/2] raw: add license header

[Paolo Bonzini]

> On Wed, Jul 31, 2013 at 08:19:51AM +0200, Paolo Bonzini wrote:
> > Most of the block layer is under the BSD license, thus it is reasonable
> > to license block/raw.c the same way.  CCed people should ACK by replying
> > with a Signed-off-by line.
> 
> The coded was intended to be GPLv2.

I guess some day we'll rewrite it, perhaps when libqblock is closer to
being merged.

Paolo

Re: [Qemu-devel] [PATCH 1/2] raw: add license header

[Peter Lieven]

On 31.07.2013 10:01, Markus Armbruster wrote:
> Paolo Bonzini <pbonzini@redhat.com> writes:
>
>> Most of the block layer is under the BSD license, thus it is reasonable
>> to license block/raw.c the same way.  CCed people should ACK by replying
>> with a Signed-off-by line.
>>
>> Cc: Christoph Hellwig <hch@lst.de>
>> Cc: Kevin Wolf <kwolf@redhat.com>
>> Cc: Anthony Liguori <aliguori@us.ibm.com>
>> Cc: Markus Armbruster <armbru@redhat.com>
>> Cc: Stefan Hajnoczi <stefanha@redhat.com>
>> Cc: Luiz Capitulino <lcapitulino@redhat.com>
>> Cc: Jeff Cody <jcody@redhat.com>
>> Cc: Peter Lieven <pl@kamp.de>
>> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> In general, I very much prefer to protect my work with a strong copyleft
> license like the GPLv2+.  However, my contributions to raw.c are
> trivial, so I choose to go with the flow in this case.
>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
same applies for me.

Signed-off-by: Peter Lieven <pl@kamp.de>

Re: [Qemu-devel] [PATCH 0/2] Clarify licensing terms

[Anthony Liguori]

Applied.  Thanks.

Regards,

Anthony Liguori

Re: [Qemu-devel] [PATCH 1/2] raw: add license header

[Anthony Liguori]

Christoph Hellwig <hch@lst.de> writes:

> On Wed, Jul 31, 2013 at 08:19:51AM +0200, Paolo Bonzini wrote:
>> Most of the block layer is under the BSD license, thus it is reasonable
>> to license block/raw.c the same way.  CCed people should ACK by replying
>> with a Signed-off-by line.
>
> The coded was intended to be GPLv2.

Can you send a patch to add your copyright to this file?  I added the
BSD license that most folks Signed-off-by but you should add your GPLv2
copyright (making the file effectively GPLv2).

Regards,

Anthony Liguori

Re: [Qemu-devel] [PATCH 2/2] LICENSE: clarify

[Christopher Covington]

Hi Paolo,

On 07/31/2013 02:19 AM, Paolo Bonzini wrote:
> 1) The GPL says that "if the Program does not specify a version number
> of this License, you may choose any version ever published by the Free
> Software Foundation".  This is not true, QEMU includes parts that are
> v2-only.
> 
> 2) Provide a default for files with no licensing information.
> 
> 3) It is not just hardware emulation that is under BSD license.
> 
> 4) Restrict GPLv2-only contributions to user mode emulation (due to
> code from Linux) and PCI passthrough (due to code from Neocleus).
> 
> 5) The rules were initially set by Fabrice but are being amended by
> other people (already in commit ee12e1f, LICENSE: There is no libqemu.a
> anymore, 2011-11-15).  Do not put words in his mouth.
> 
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  LICENSE | 15 ++++++++++-----
>  1 file changed, 10 insertions(+), 5 deletions(-)
> 
> diff --git a/LICENSE b/LICENSE
> index acae9a3..2bd2e95 100644
> --- a/LICENSE
> +++ b/LICENSE
> @@ -1,16 +1,21 @@
>  The following points clarify the QEMU license:
>  
> -1) QEMU as a whole is released under the GNU General Public License
> +1) QEMU as a whole is released under the GNU General Public License,
> +version 2.
>  
>  2) Parts of QEMU have specific licenses which are compatible with the
> -GNU General Public License. Hence each source file contains its own
> -licensing information.
> +GNU General Public License, version 2. Hence each source file contains
> +its own licensing information.  Source files with no licensing information
> +are released under the GNU General Public License, version 2 or (at your
> +option) any later version.
>  
> -Many hardware device emulation sources are released under the BSD license.
> +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/misc/vfio.c, hw/xen/xen_pt*.
>  
>  3) The Tiny Code Generator (TCG) is released under the BSD license
>     (see license headers in files).
>  
>  4) QEMU is a trademark of Fabrice Bellard.
>  
> -Fabrice Bellard.
> +Fabrice Bellard and the QEMU team

http://wiki.qemu.org/License appears to be out of sync with these changes.

Thanks,
Chris

-- 
Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project