From 72ae1577ed7e60ca47b251897c6bfd6bfff5deec Mon Sep 17 00:00:00 2001 From: Muminul Islam Date: Thu, 25 Jun 2020 17:06:14 -0700 Subject: [PATCH] hypervisor: Update license to Apache-2.0 OR BSD-3-Clause Initially the licensing was just Apache-2.0. This patch changes the licensing to dual license Apache-2.0 OR BSD-3-Clause Signed-off-by: Muminul Islam --- hypervisor/src/arch/mod.rs | 5 ++++- hypervisor/src/arch/x86/mod.rs | 5 ++++- hypervisor/src/cpu.rs | 4 ++-- hypervisor/src/hypervisor.rs | 2 +- hypervisor/src/kvm/aarch64/mod.rs | 5 ++++- hypervisor/src/kvm/mod.rs | 2 +- hypervisor/src/kvm/x86_64/mod.rs | 2 +- hypervisor/src/lib.rs | 2 +- hypervisor/src/vm.rs | 2 +- 9 files changed, 19 insertions(+), 10 deletions(-) diff --git a/hypervisor/src/arch/mod.rs b/hypervisor/src/arch/mod.rs index 427a4fd4a..fbfea47c2 100644 --- a/hypervisor/src/arch/mod.rs +++ b/hypervisor/src/arch/mod.rs @@ -6,7 +6,10 @@ // // Copyright © 2019 Intel Corporation // -// SPDX-License-Identifier: Apache-2.0 AND BSD-3-Clause +// SPDX-License-Identifier: Apache-2.0 OR BSD-3-Clause +// +// Copyright © 2020, Microsoft Corporation +// #[cfg(target_arch = "x86_64")] pub mod x86; diff --git a/hypervisor/src/arch/x86/mod.rs b/hypervisor/src/arch/x86/mod.rs index 1afb1715c..50bd8bb84 100644 --- a/hypervisor/src/arch/x86/mod.rs +++ b/hypervisor/src/arch/x86/mod.rs @@ -6,7 +6,10 @@ // // Copyright © 2019 Intel Corporation // -// SPDX-License-Identifier: Apache-2.0 AND BSD-3-Clause +// SPDX-License-Identifier: Apache-2.0 OR BSD-3-Clause +// +// Copyright © 2020, Microsoft Corporation +// #[allow(non_upper_case_globals)] #[allow(non_camel_case_types)] diff --git a/hypervisor/src/cpu.rs b/hypervisor/src/cpu.rs index f2fead3fa..76895bab8 100644 --- a/hypervisor/src/cpu.rs +++ b/hypervisor/src/cpu.rs @@ -1,12 +1,12 @@ // Copyright © 2019 Intel Corporation // -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0 OR BSD-3-Clause // // Copyright © 2020, Microsoft Corporation // // Copyright 2018-2019 CrowdStrike, Inc. // -// SPDX-License-Identifier: Apache-2.0 OR MIT +// #[cfg(target_arch = "aarch64")] use crate::aarch64::VcpuInit; diff --git a/hypervisor/src/hypervisor.rs b/hypervisor/src/hypervisor.rs index bbbb4efb0..dcafa9c8d 100644 --- a/hypervisor/src/hypervisor.rs +++ b/hypervisor/src/hypervisor.rs @@ -1,6 +1,6 @@ // Copyright © 2019 Intel Corporation // -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0 OR BSD-3-Clause // // Copyright © 2020, Microsoft Corporation // diff --git a/hypervisor/src/kvm/aarch64/mod.rs b/hypervisor/src/kvm/aarch64/mod.rs index af25e846a..12ff30549 100644 --- a/hypervisor/src/kvm/aarch64/mod.rs +++ b/hypervisor/src/kvm/aarch64/mod.rs @@ -1,9 +1,12 @@ // Copyright © 2019 Intel Corporation // -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0 OR BSD-3-Clause // // Copyright © 2020, Microsoft Corporation // +// Copyright 2018-2019 CrowdStrike, Inc. +// +// /// /// Export generically-named wrappers of kvm-bindings for Unix-based platforms diff --git a/hypervisor/src/kvm/mod.rs b/hypervisor/src/kvm/mod.rs index 9cf1753e0..65eaeca70 100644 --- a/hypervisor/src/kvm/mod.rs +++ b/hypervisor/src/kvm/mod.rs @@ -1,6 +1,6 @@ // Copyright © 2019 Intel Corporation // -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0 OR BSD-3-Clause // // Copyright © 2020, Microsoft Corporation // diff --git a/hypervisor/src/kvm/x86_64/mod.rs b/hypervisor/src/kvm/x86_64/mod.rs index 0abf68d50..ceea19845 100644 --- a/hypervisor/src/kvm/x86_64/mod.rs +++ b/hypervisor/src/kvm/x86_64/mod.rs @@ -1,6 +1,6 @@ // Copyright © 2019 Intel Corporation // -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0 OR BSD-3-Clause // // Copyright © 2020, Microsoft Corporation // diff --git a/hypervisor/src/lib.rs b/hypervisor/src/lib.rs index 7b0d9f912..50fae9700 100644 --- a/hypervisor/src/lib.rs +++ b/hypervisor/src/lib.rs @@ -1,6 +1,6 @@ // Copyright © 2019 Intel Corporation // -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0 OR BSD-3-Clause // // Copyright © 2020, Microsoft Corporation // diff --git a/hypervisor/src/vm.rs b/hypervisor/src/vm.rs index b964badf0..72099c7c1 100644 --- a/hypervisor/src/vm.rs +++ b/hypervisor/src/vm.rs @@ -1,6 +1,6 @@ // Copyright © 2019 Intel Corporation // -// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: Apache-2.0 OR BSD-3-Clause // // Copyright © 2020, Microsoft Corporation //