On Thu, Nov 16, 2017 at 07:47:44AM +0100, Stefan Weil wrote: > Am 16.11.2017 um 07:50 schrieb yu.n...@linux.intel.com: > > From: Yu Ning <yu.n...@intel.com> > > > > 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.
Why is this a problem? > > > > 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 The existing code on qemu.git don't match the code on the GitHub repository above exactly, and its copyright history looks hard to track[1]. If we really care about consistency between the two projects, shouldn't we just delete the existing file and copy the headers from github.com/intel/haxm directly? [1] https://github.com/qemu/qemu/commit/47c1c8c12f6c8b3c6e0da7bbd93fd4e1724cf114 https://android.googlesource.com/platform/external/qemu-android/+/2b3098ff27bab079caab9b46b58546b5036f5c0c/target-i386/hax-interface.h Also, does it even make sense to keep the two licenses in the file? > > > > Signed-off-by: Yu Ning <yu.n...@intel.com> > > --- > > 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 <s...@weilnetz.de> > > 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. -- Eduardo
