Re: [Qemu-devel] [PATCH v6 01/36] qapi: Add copyright declaration on docs

[Markus Armbruster <armbru@redhat.com>]

Eric Blake <eblake@redhat.com> writes:

> While our top-level COPYING with its GPLv2+ license applies to
> any documentation file that omits explicit instructions, these
> days it's better to be a good example of calling out our
> intentions.  Correct use of GPL requires the use of a copyright
> statement, so I'm adding notice to two QAPI documents, by
> attributing these files to the initial authors and major
> contributors.  I used:
>
> $ git blame --line-porcelain $file \
>   | sed -n 's/^author //p' | sort | uniq -c | sort -rn
>
> to determine authorship of these two files.  qmp-spec.txt blames
> entirely to Red Hat (easy, since my contribution falls in that
> category); while qapi-code-gen.txt has multiple contributors
> representing multiple entities.  But since it was originally
> supplied by Michael Roth, the notice I added there copies the
> notice he has used in other files.  As there is no intended
> change in license from the implicit one previously present from
> the top level, I have not bothered to CC other contributors;
> if we want to weaken things to something looser (such as LGPL)
> so that there is no question that someone re-implementing the
> spec is not forced to use GPL, that would be a different commit.
>
> CC: Michael Roth <mdroth@linux.vnet.ibm.com>
> Signed-off-by: Eric Blake <eblake@redhat.com>
>
> ---
>
> v6: split off from v5:1/28, add Copyright lines
> ---
>  docs/qapi-code-gen.txt |  8 ++++++++
>  docs/qmp/qmp-spec.txt  | 10 ++++++++++
>  2 files changed, 18 insertions(+)
>
> diff --git a/docs/qapi-code-gen.txt b/docs/qapi-code-gen.txt
> index 8313ba6..e8bbaf8 100644
> --- a/docs/qapi-code-gen.txt
> +++ b/docs/qapi-code-gen.txt
> @@ -1,5 +1,13 @@
>  = How to use the QAPI code generator =
>
> +Copyright IBM Corp. 2011
> +Copyright (C) 2012-2015 Red Hat, Inc.
> +
> +This work is licensed under the terms of the GNU GPL, version 2 or
> +later. See the COPYING file in the top-level directory.
> +
> +== Introduction ==
> +
>  QAPI is a native C API within QEMU which provides management-level
>  functionality to internal/external users. For external
>  users/processes, this interface is made available by a JSON-based
> diff --git a/docs/qmp/qmp-spec.txt b/docs/qmp/qmp-spec.txt
> index 22568c6..3e503e6 100644
> --- a/docs/qmp/qmp-spec.txt
> +++ b/docs/qmp/qmp-spec.txt
> @@ -1,5 +1,15 @@
>                        QEMU Machine Protocol Specification
>
> +0. About This Document
> +======================
> +
> +Copyright (C) 2009-2015 Red Hat, Inc.
> +
> +This work is licensed under the terms of the GNU GPL, version 2 or
> +later. See the COPYING file in the top-level directory.
> +
> +Last revised in March 2015.

s/March/April/

I recomment not to add this line.  It goes stale easily, and git is much
more reliable source of revision information anyway.  Matter of taste,
so...

> +
>  1. Introduction
>  ===============

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