Skip to content

Commit eb2fc0b

Browse files
committed
Normalize license statements
Normalize license statements as: . BSD-3-Clause: code dirived from crosvm without modifications . Apache2 or BSD-3-Clause: code dirived from crosvm with modifications and enhancements. . Apache2: newly developed code Signed-off-by: Liu Jiang <[email protected]>
1 parent f3d1c27 commit eb2fc0b

13 files changed

+27
-21
lines changed

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = "vm-memory"
33
version = "0.1.0"
44
authors = ["Liu Jiang <[email protected]>"]
55
repository = "https://github.com/rust-vmm/vm-memory"
6-
license = "Apache-2.0"
6+
license = "Apache-2.0 OR BSD-3-Clause"
77
edition = "2018"
88

99
[features]

LICENSE renamed to LICENSE-APACHE

File renamed without changes.
File renamed without changes.

README.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ fn virt_device_io<T: GuestMemory>(mem: &T) {
5151

5252
## License
5353

54-
This project is licensed under
54+
This project is licensed under either of
5555

5656
- [Apache License](http://www.apache.org/licenses/LICENSE-2.0), Version 2.0
57+
- [BSD-3-Clause License](https://opensource.org/licenses/BSD-3-Clause)

src/address.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
// Copyright (C) 2019 Alibaba Cloud Computing. All rights reserved.
2-
// SPDX-License-Identifier: Apache-2.0
32
//
43
// Portions Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
5-
// SPDX-License-Identifier: Apache-2.0
64
//
75
// Portions Copyright 2017 The Chromium OS Authors. All rights reserved.
86
// Use of this source code is governed by a BSD-style license that can be
9-
// found in the THIRD-PARTY file.
7+
// found in the LICENSE-BSD-3-Clause file.
8+
//
9+
// SPDX-License-Identifier: Apache-2.0 OR BSD-3-Clause
1010

1111
//! Traits to represent an address within an address space.
1212
//!

src/bytes.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
// Portions Copyright 2019 Red Hat, Inc.
22
//
33
// Portions Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
4-
// SPDX-License-Identifier: Apache-2.0
54
//
65
// Portions Copyright 2017 The Chromium OS Authors. All rights reserved.
76
// Use of this source code is governed by a BSD-style license that can be
8-
// found in the THIRD-PARTY file.
7+
// found in the LICENSE-BSD-3-Clause file.
8+
//
9+
// SPDX-License-Identifier: Apache-2.0 OR BSD-3-Clause
910

1011
//! Define the ByteValued trait to mark that it is safe to instantiate the struct with random data.
1112

src/endian.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
// Copyright 2017 The Chromium OS Authors. All rights reserved.
22
// Use of this source code is governed by a BSD-style license that can be
3-
// found in the LICENSE file.
3+
// found in the LICENSE-BSD-3-Clause file.
4+
//
5+
// SPDX-License-Identifier: Apache-2.0 OR BSD-3-Clause
46

57
//! Explicit endian types useful for embedding in structs or reinterpreting data.
68
//!

src/guest_memory.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
// Copyright (C) 2019 Alibaba Cloud Computing. All rights reserved.
2-
// SPDX-License-Identifier: Apache-2.0
32
//
43
// Portions Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
5-
// SPDX-License-Identifier: Apache-2.0
64
//
75
// Portions Copyright 2017 The Chromium OS Authors. All rights reserved.
86
// Use of this source code is governed by a BSD-style license that can be
9-
// found in the THIRD-PARTY file.
7+
// found in the LICENSE-BSD-3-Clause file.
8+
//
9+
// SPDX-License-Identifier: Apache-2.0 OR BSD-3-Clause
1010

1111
//! Traits to track and access the physical memory of the guest.
1212
//!

src/lib.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
// Portions Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2-
// SPDX-License-Identifier: Apache-2.0
32
//
43
// Portions Copyright 2017 The Chromium OS Authors. All rights reserved.
54
// Use of this source code is governed by a BSD-style license that can be
6-
// found in the THIRD-PARTY file.
5+
// found in the LICENSE-BSD-3-Clause file.
6+
//
7+
// SPDX-License-Identifier: Apache-2.0 OR BSD-3-Clause
78

89
//! Traits for allocating, handling and interacting with the VM's physical memory.
910
//!

src/mmap.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
// Copyright (C) 2019 Alibaba Cloud Computing. All rights reserved.
2-
// SPDX-License-Identifier: Apache-2.0
32
//
43
// Portions Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
5-
// SPDX-License-Identifier: Apache-2.0
64
//
75
// Portions Copyright 2017 The Chromium OS Authors. All rights reserved.
86
// Use of this source code is governed by a BSD-style license that can be
9-
// found in the THIRD-PARTY file.
7+
// found in the LICENSE-BSD-3-Clause file.
8+
//
9+
// SPDX-License-Identifier: Apache-2.0 OR BSD-3-Clause
1010

1111
//! The default implementation for the [`GuestMemory`](trait.GuestMemory.html) trait.
1212
//!

src/mmap_unix.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
// Copyright (C) 2019 Alibaba Cloud Computing. All rights reserved.
2-
// SPDX-License-Identifier: Apache-2.0
32
//
43
// Portions Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
5-
// SPDX-License-Identifier: Apache-2.0
64
//
75
// Portions Copyright 2017 The Chromium OS Authors. All rights reserved.
86
// Use of this source code is governed by a BSD-style license that can be
9-
// found in the THIRD-PARTY file.
7+
// found in the LICENSE-BSD-3-Clause file.
8+
//
9+
// SPDX-License-Identifier: Apache-2.0 OR BSD-3-Clause
1010

1111
//! Helper structure for working with mmaped memory regions in Unix.
1212

src/mmap_windows.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// Copyright (C) 2019 CrowdStrike, Inc. All rights reserved.
2-
// SPDX-License-Identifier: Apache-2.0
3-
//
2+
// SPDX-License-Identifier: Apache-2.0 OR BSD-3-Clause
43

54
//! Helper structure for working with mmaped memory regions in Windows.
65

src/volatile_memory.rs

+2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
// Copyright 2017 The Chromium OS Authors. All rights reserved.
44
// Use of this source code is governed by a BSD-style license that can be
55
// found in the THIRT-PARTY file.
6+
//
7+
// SPDX-License-Identifier: Apache-2.0 OR BSD-3-Clause
68

79
//! Types for volatile access to memory.
810
//!

0 commit comments

Comments
 (0)