Snap for 11413328 from 45d546ab6102a9789f487945f5356bf24d9b7124 to 24Q2-release
Change-Id: Iaeabf2be8245b9d411260e45619c2dc505e63d27
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json
index b29232a..c635c84 100644
--- a/.cargo_vcs_info.json
+++ b/.cargo_vcs_info.json
@@ -1,6 +1,6 @@
{
"git": {
- "sha1": "854e098e4871f2ea487b1853bc21f02d6c1e8057"
+ "sha1": "d219302978ddaee67bd341433e8ac219da0302b8"
},
- "path_in_vcs": "crates/devices/virtio-vsock"
+ "path_in_vcs": "virtio-vsock"
}
\ No newline at end of file
diff --git a/Android.bp b/Android.bp
index 2c49229..4c6c9e0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -5,7 +5,7 @@
name: "libvirtio_vsock",
crate_name: "virtio_vsock",
cargo_env_compat: true,
- cargo_pkg_version: "0.3.1",
+ cargo_pkg_version: "0.5.0",
srcs: ["src/lib.rs"],
edition: "2021",
rustlibs: [
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 890b8fd..0d94420 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,30 @@
+# Upcoming
+
+# v0.5.0
+
+## Changes
+
+- Update vm-memory from 0.13.1 to 0.14.0.
+- Update virtio-queue from 0.10.0 to 0.11.0.
+
+# v0.4.0
+
+Mostly identical to v0.3.2, which was incorrectly published as minor release.
+
+## Changes
+
+- Update virtio-queue from 0.9.1 to 0.10.0 (same minor/major problems)
+
+# v0.3.2 - yanked
+
+This version got yanked. It should have been a major release. The vm-memory
+dependency - which received a major bump - is part of the public interface.
+
+## Changes
+
+- Update vm-memory from 0.12.0 to 0.13.1.
+- Update virtio-queue from 0.9.0 to 0.9.1.
+
# v0.3.1
## Changes
diff --git a/Cargo.toml b/Cargo.toml
index 4bdb1d4..74210ab 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,7 +12,7 @@
[package]
edition = "2021"
name = "virtio-vsock"
-version = "0.3.1"
+version = "0.5.0"
authors = [
"rust-vmm community",
"rust-vmm AWS maintainers <[email protected]>",
@@ -28,20 +28,20 @@
resolver = "1"
[dependencies.virtio-bindings]
-version = "0.2.1"
+version = "0.2.2"
[dependencies.virtio-queue]
-version = "0.9.0"
+version = "0.11.0"
[dependencies.vm-memory]
-version = "0.12.0"
+version = "0.14.0"
[dev-dependencies.virtio-queue]
-version = "0.9.0"
+version = "0.11.0"
features = ["test-utils"]
[dev-dependencies.vm-memory]
-version = "0.12.0"
+version = "0.14.0"
features = [
"backend-mmap",
"backend-atomic",
diff --git a/Cargo.toml.orig b/Cargo.toml.orig
index 140f7d3..36a8dde 100644
--- a/Cargo.toml.orig
+++ b/Cargo.toml.orig
@@ -1,6 +1,6 @@
[package]
name = "virtio-vsock"
-version = "0.3.1"
+version = "0.5.0"
authors = ["rust-vmm community", "rust-vmm AWS maintainers <[email protected]>"]
description = "virtio vsock device implementation"
repository = "https://github.com/rust-vmm/vm-virtio"
@@ -11,10 +11,10 @@
[dependencies]
# The `path` part gets stripped when publishing the crate.
-virtio-queue = { path = "../../virtio-queue", version = "0.9.0" }
-virtio-bindings = { path = "../../virtio-bindings", version = "0.2.1" }
-vm-memory = "0.12.0"
+virtio-queue = { path = "../virtio-queue", version = "0.11.0" }
+virtio-bindings = { path = "../virtio-bindings", version = "0.2.2" }
+vm-memory = "0.14.0"
[dev-dependencies]
-virtio-queue = { path = "../../virtio-queue", version = "0.9.0", features = ["test-utils"] }
-vm-memory = { version = "0.12.0", features = ["backend-mmap", "backend-atomic"] }
+virtio-queue = { path = "../virtio-queue", version = "0.11.0", features = ["test-utils"] }
+vm-memory = { version = "0.14.0", features = ["backend-mmap", "backend-atomic"] }
diff --git a/LICENSE-BSD-3-Clause b/LICENSE-BSD-3-Clause
deleted file mode 100644
index 8bafca3..0000000
--- a/LICENSE-BSD-3-Clause
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2017 The Chromium OS Authors. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-// * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// * 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.
-// * Neither the name of Google Inc. 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
-// OWNER 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.
diff --git a/LICENSE_APACHE b/LICENSE_APACHE
deleted file mode 100644
index d645695..0000000
--- a/LICENSE_APACHE
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
diff --git a/METADATA b/METADATA
index bcb3501..1864b1e 100644
--- a/METADATA
+++ b/METADATA
@@ -1,19 +1,24 @@
+# This project was upgraded with external_updater.
+# Usage: tools/external_updater/updater.sh update external/rust/crates/virtio-vsock
+# For more info, check https://cs.android.com/android/platform/superproject/+/main:tools/external_updater/README.md
+
name: "virtio-vsock"
description: "virtio vsock device implementation"
third_party {
+ license_type: NOTICE
+ last_upgrade_date {
+ year: 2024
+ month: 2
+ day: 6
+ }
identifier {
type: "crates.io"
- value: "https://crates.io/crates/virtio-vsock"
+ value: "https://static.crates.io/crates/virtio-vsock/virtio-vsock-0.5.0.crate"
+ version: "0.3.1"
}
identifier {
type: "Archive"
value: "https://static.crates.io/crates/virtio-vsock/virtio-vsock-0.3.1.crate"
- }
- version: "0.3.1"
- license_type: NOTICE
- last_upgrade_date {
- year: 2023
- month: 8
- day: 23
+ version: "0.5.0"
}
}
diff --git a/src/packet.rs b/src/packet.rs
index d493503..fe01c73 100644
--- a/src/packet.rs
+++ b/src/packet.rs
@@ -878,14 +878,14 @@
assert_eq!(packet.header, PacketHeader::default());
let header = packet.header_slice();
assert_eq!(
- header.as_ptr(),
+ header.ptr_guard().as_ptr(),
mem.get_host_address(GuestAddress(0x5_0000)).unwrap()
);
assert_eq!(header.len(), PKT_HEADER_SIZE);
let data = packet.data_slice().unwrap();
assert_eq!(
- data.as_ptr(),
+ data.ptr_guard().as_ptr(),
mem.get_host_address(GuestAddress(0x8_0000)).unwrap()
);
assert_eq!(data.len(), 0x100);
@@ -911,14 +911,14 @@
assert_eq!(packet.header, PacketHeader::default());
let header = packet.header_slice();
assert_eq!(
- header.as_ptr(),
+ header.ptr_guard().as_ptr(),
mem.get_host_address(GuestAddress(0x5_0000)).unwrap()
);
assert_eq!(header.len(), PKT_HEADER_SIZE);
let data = packet.data_slice().unwrap();
assert_eq!(
- data.as_ptr(),
+ data.ptr_guard().as_ptr(),
mem.get_host_address(GuestAddress(0x5_0000 + PKT_HEADER_SIZE as u64))
.unwrap()
);
@@ -976,7 +976,7 @@
assert_eq!(packet.header, header);
let header_slice = packet.header_slice();
assert_eq!(
- header_slice.as_ptr(),
+ header_slice.ptr_guard().as_ptr(),
mem.get_host_address(GuestAddress(0x10_0000)).unwrap()
);
assert_eq!(header_slice.len(), PKT_HEADER_SIZE);
@@ -1116,7 +1116,7 @@
assert_eq!(packet.header, header);
let header_slice = packet.header_slice();
assert_eq!(
- header_slice.as_ptr(),
+ header_slice.ptr_guard().as_ptr(),
mem.get_host_address(GuestAddress(0x5_0000)).unwrap()
);
assert_eq!(header_slice.len(), PKT_HEADER_SIZE);
@@ -1125,7 +1125,7 @@
let data = packet.data_slice().unwrap();
assert_eq!(
- data.as_ptr(),
+ data.ptr_guard().as_ptr(),
mem.get_host_address(GuestAddress(0x8_0000)).unwrap()
);
assert_eq!(data.len(), LEN as usize);
@@ -1151,7 +1151,7 @@
assert_eq!(packet.header, header);
let header_slice = packet.header_slice();
assert_eq!(
- header_slice.as_ptr(),
+ header_slice.ptr_guard().as_ptr(),
mem.get_host_address(GuestAddress(0x5_0000)).unwrap()
);
assert_eq!(header_slice.len(), PKT_HEADER_SIZE);
@@ -1160,7 +1160,7 @@
let data = packet.data_slice().unwrap();
assert_eq!(
- data.as_ptr(),
+ data.ptr_guard().as_ptr(),
mem.get_host_address(GuestAddress(0x5_0000 + PKT_HEADER_SIZE as u64))
.unwrap()
);
@@ -1346,16 +1346,25 @@
// SAFETY: safe because ``hdr_raw` and `data_raw` live for as long as
// the scope of the current test.
let packet = unsafe { VsockPacket::new(hdr_raw, Some(data_raw)).unwrap() };
- assert_eq!(packet.header_slice.as_ptr(), hdr_raw.as_mut_ptr());
+ assert_eq!(
+ packet.header_slice.ptr_guard().as_ptr(),
+ hdr_raw.as_mut_ptr(),
+ );
assert_eq!(packet.header_slice.len(), PKT_HEADER_SIZE);
assert_eq!(packet.header, PacketHeader::default());
- assert_eq!(packet.data_slice.unwrap().as_ptr(), data_raw.as_mut_ptr());
+ assert_eq!(
+ packet.data_slice.unwrap().ptr_guard().as_ptr(),
+ data_raw.as_mut_ptr(),
+ );
assert_eq!(packet.data_slice.unwrap().len(), LEN as usize);
// SAFETY: Safe because ``hdr_raw` and `data_raw` live as long as the
// scope of the current test.
let packet = unsafe { VsockPacket::new(hdr_raw, None).unwrap() };
- assert_eq!(packet.header_slice.as_ptr(), hdr_raw.as_mut_ptr());
+ assert_eq!(
+ packet.header_slice.ptr_guard().as_ptr(),
+ hdr_raw.as_mut_ptr(),
+ );
assert_eq!(packet.header, PacketHeader::default());
assert!(packet.data_slice.is_none());
