From patchwork Thu Nov 16 06:50:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Ning X-Patchwork-Id: 10060781 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1E64760230 for ; Thu, 16 Nov 2017 06:39:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0D062289B1 for ; Thu, 16 Nov 2017 06:39:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F3FA62A7E9; Thu, 16 Nov 2017 06:39:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7C0DB289B1 for ; Thu, 16 Nov 2017 06:39:26 +0000 (UTC) Received: from localhost ([::1]:39256 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eFDpd-0000sm-HB for patchwork-qemu-devel@patchwork.kernel.org; Thu, 16 Nov 2017 01:39:25 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35629) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eFDp2-0000sh-RI for qemu-devel@nongnu.org; Thu, 16 Nov 2017 01:38:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eFDoy-0002sO-Q0 for qemu-devel@nongnu.org; Thu, 16 Nov 2017 01:38:48 -0500 Received: from mga09.intel.com ([134.134.136.24]:61746) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eFDoy-0002r3-F2 for qemu-devel@nongnu.org; Thu, 16 Nov 2017 01:38:44 -0500 Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 15 Nov 2017 22:38:42 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.44,402,1505804400"; d="scan'208";a="2151308" Received: from otcsdk-dev2.bj.intel.com ([10.238.158.186]) by fmsmga004.fm.intel.com with ESMTP; 15 Nov 2017 22:38:40 -0800 From: yu.ning@linux.intel.com To: qemu-devel@nongnu.org Date: Thu, 16 Nov 2017 14:50:25 +0800 Message-Id: <1510815025-27857-1-git-send-email-yu.ning@linux.intel.com> X-Mailer: git-send-email 2.7.4 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.24 Subject: [Qemu-devel] [PATCH] hax-interface: Add BSD license X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Eduardo Habkost , Yu Ning , Richard Henderson Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Yu Ning 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 Reviewed-by: Stefan Weil --- 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