Re: [Qemu-devel] [PATCH] hax-interface: Add BSD license

[Stefan Weil]

Am 16.11.2017 um 07:50 schrieb address@hidden:
> From: Yu Ning <address@hidden>
> 
> hax-interface.h defines the interface between the HAXM kernel
> module and the HAXM QEMU accelerator. The same code can be found in
> the following files of the HAXM kernel module:
> 
>  include/hax_interface.h
>  include/vcpu_state.h
>  core/include/vm.h
> 
> These files are now open source under the 3-clause BSD license,
> whereas hax-interface.h in QEMU uses GPLv2.
> 
> Address this inconsistency by adding the BSD license to the QEMU
> file, per Stefan Weil's comment on this HAXM pull request:
> 
>  https://github.com/intel/haxm/pull/2
> 
> Signed-off-by: Yu Ning <address@hidden>
> ---
>  target/i386/hax-interface.h | 29 +++++++++++++++++++++++++++++
>  1 file changed, 29 insertions(+)
> 
> diff --git a/target/i386/hax-interface.h b/target/i386/hax-interface.h
> index d141308..9a36c9a 100644
> --- a/target/i386/hax-interface.h
> +++ b/target/i386/hax-interface.h
> @@ -1,4 +1,33 @@
>  /*
> + * Copyright (c) 2011 Intel Corporation
> + *
> + * Redistribution and use in source and binary forms, with or without
> + * modification, are permitted provided that the following conditions are 
> met:
> + *
> + *   1. Redistributions of source code must retain the above copyright 
> notice,
> + *      this list of conditions and the following disclaimer.
> + *
> + *   2. Redistributions in binary form must reproduce the above copyright
> + *      notice, this list of conditions and the following disclaimer in the
> + *      documentation and/or other materials provided with the distribution.
> + *
> + *   3. Neither the name of the copyright holder nor the names of its
> + *      contributors may be used to endorse or promote products derived from
> + *      this software without specific prior written permission.
> + *
> + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS 
> IS"
> + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
> + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
> + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
> + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
> + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
> + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
> + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
> + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
> + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
> + * POSSIBILITY OF SUCH DAMAGE.
> + */
> +/*
>   * QEMU HAXM support
>   *
>   * Copyright (c) 2011 Intel Corporation
> 

Reviewed-by: Stefan Weil <address@hidden>

CC'ing Vincent who added the file to the QEMU code base.

Maybe the two licenses in the header could be re-arranged when merging
that commit.

Regards,
Stefan