diff options
| -rw-r--r-- | .cargo_vcs_info.json | 2 | ||||
| -rw-r--r-- | Android.bp | 2 | ||||
| -rw-r--r-- | CHANGELOG.md | 9 | ||||
| -rw-r--r-- | CONTRIBUTING.md | 18 | ||||
| -rw-r--r-- | Cargo.toml | 3 | ||||
| -rw-r--r-- | Cargo.toml.orig | 2 | ||||
| -rw-r--r-- | LICENSE-APACHE | 202 | ||||
| -rw-r--r-- | LICENSE-BSD-3-Clause | 27 | ||||
| -rw-r--r-- | METADATA | 21 | ||||
| -rw-r--r-- | src/virtio_config.rs | 1 | ||||
| -rw-r--r-- | src/virtio_ids.rs | 48 | ||||
| -rw-r--r-- | src/virtio_net/generated.rs | 1 |
12 files changed, 90 insertions, 246 deletions
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json index d648267..1038472 100644 --- a/.cargo_vcs_info.json +++ b/.cargo_vcs_info.json @@ -1,6 +1,6 @@ { "git": { - "sha1": "854e098e4871f2ea487b1853bc21f02d6c1e8057" + "sha1": "0494c052bbcdb0565f2a3f29ddbe3e5e8bc55b67" }, "path_in_vcs": "crates/virtio-bindings" }
\ No newline at end of file @@ -5,7 +5,7 @@ rust_library_host { name: "libvirtio_bindings", crate_name: "virtio_bindings", cargo_env_compat: true, - cargo_pkg_version: "0.2.1", + cargo_pkg_version: "0.2.2", srcs: ["src/lib.rs"], edition: "2021", } diff --git a/CHANGELOG.md b/CHANGELOG.md index 8693370..8157c27 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +# Upcoming Release + +# v0.2.2 + +## Added + +- Added bindings for virtio_ids.h +- Regenerate bindings with Linux 6.4. + # v0.2.1 - Regenerate bindings with Linux 6.3. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2dabef0..b0d98ee 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -28,14 +28,22 @@ cd linux # Step 1: Checkout the version you want to generate the bindings for. git checkout v5.0 -# Step 2: Generate the bindings from the kernel headers. We need to -# generate a file for each one of the virtio headers we're interested on. -# For the moment, we're generating "virtio_blk", "virtio_gpu", "virtio_mmio", -# "virtio_net", "virtio_ring" and "virtio_scsi". Feel free to add additional header files if +# Step 2: Generate the bindings from the kernel headers. We need to generate a +# file for each one of the virtio headers. For the moment, we are only picking +# headers that we are interested in. Feel free to add additional header files if # you need them for your project. make headers_install INSTALL_HDR_PATH=v5_0_headers cd v5_0_headers -for i in virtio_blk virtio_config virtio_gpu virtio_mmio virtio_net virtio_ring virtio_scsi ; do \ +for i in \ + virtio_blk \ + virtio_config \ + virtio_gpu \ + virtio_ids \ + virtio_mmio \ + virtio_net \ + virtio_ring \ + virtio_scsi \ + ; do \ bindgen include/linux/$i.h -o $i.rs \ --allowlist-file include/linux/$i.h \ --with-derive-default \ @@ -12,13 +12,14 @@ [package] edition = "2021" name = "virtio-bindings" -version = "0.2.1" +version = "0.2.2" authors = ["Sergio Lopez <slp@redhat.com>"] description = "Rust FFI bindings to virtio generated using bindgen." readme = "README.md" keywords = ["virtio"] license = "BSD-3-Clause OR Apache-2.0" repository = "https://github.com/rust-vmm/vm-virtio" +resolver = "1" [dependencies] diff --git a/Cargo.toml.orig b/Cargo.toml.orig index 5fe4f03..641b0cf 100644 --- a/Cargo.toml.orig +++ b/Cargo.toml.orig @@ -1,6 +1,6 @@ [package] name = "virtio-bindings" -version = "0.2.1" +version = "0.2.2" authors = ["Sergio Lopez <slp@redhat.com>"] description = "Rust FFI bindings to virtio generated using bindgen." repository = "https://github.com/rust-vmm/vm-virtio" 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/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. @@ -1,19 +1,24 @@ +# This project was upgraded with external_updater. +# Usage: tools/external_updater/updater.sh update external/rust/crates/virtio-bindings +# For more info, check https://cs.android.com/android/platform/superproject/+/main:tools/external_updater/README.md + name: "virtio-bindings" description: "Rust FFI bindings to virtio generated using bindgen." third_party { + license_type: NOTICE + last_upgrade_date { + year: 2024 + month: 2 + day: 6 + } identifier { type: "crates.io" - value: "https://crates.io/crates/virtio-bindings" + value: "https://static.crates.io/crates/virtio-bindings/virtio-bindings-0.2.2.crate" + version: "0.2.1" } identifier { type: "Archive" value: "https://static.crates.io/crates/virtio-bindings/virtio-bindings-0.2.1.crate" - } - version: "0.2.1" - license_type: NOTICE - last_upgrade_date { - year: 2023 - month: 8 - day: 23 + version: "0.2.2" } } diff --git a/src/virtio_config.rs b/src/virtio_config.rs index 5ef84b1..7a6d163 100644 --- a/src/virtio_config.rs +++ b/src/virtio_config.rs @@ -17,4 +17,5 @@ pub const VIRTIO_F_RING_PACKED: u32 = 34; pub const VIRTIO_F_IN_ORDER: u32 = 35; pub const VIRTIO_F_ORDER_PLATFORM: u32 = 36; pub const VIRTIO_F_SR_IOV: u32 = 37; +pub const VIRTIO_F_NOTIFICATION_DATA: u32 = 38; pub const VIRTIO_F_RING_RESET: u32 = 40; diff --git a/src/virtio_ids.rs b/src/virtio_ids.rs new file mode 100644 index 0000000..71dab81 --- /dev/null +++ b/src/virtio_ids.rs @@ -0,0 +1,48 @@ +/* automatically generated by rust-bindgen 0.63.0 */ + +pub const VIRTIO_ID_NET: u32 = 1; +pub const VIRTIO_ID_BLOCK: u32 = 2; +pub const VIRTIO_ID_CONSOLE: u32 = 3; +pub const VIRTIO_ID_RNG: u32 = 4; +pub const VIRTIO_ID_BALLOON: u32 = 5; +pub const VIRTIO_ID_IOMEM: u32 = 6; +pub const VIRTIO_ID_RPMSG: u32 = 7; +pub const VIRTIO_ID_SCSI: u32 = 8; +pub const VIRTIO_ID_9P: u32 = 9; +pub const VIRTIO_ID_MAC80211_WLAN: u32 = 10; +pub const VIRTIO_ID_RPROC_SERIAL: u32 = 11; +pub const VIRTIO_ID_CAIF: u32 = 12; +pub const VIRTIO_ID_MEMORY_BALLOON: u32 = 13; +pub const VIRTIO_ID_GPU: u32 = 16; +pub const VIRTIO_ID_CLOCK: u32 = 17; +pub const VIRTIO_ID_INPUT: u32 = 18; +pub const VIRTIO_ID_VSOCK: u32 = 19; +pub const VIRTIO_ID_CRYPTO: u32 = 20; +pub const VIRTIO_ID_SIGNAL_DIST: u32 = 21; +pub const VIRTIO_ID_PSTORE: u32 = 22; +pub const VIRTIO_ID_IOMMU: u32 = 23; +pub const VIRTIO_ID_MEM: u32 = 24; +pub const VIRTIO_ID_SOUND: u32 = 25; +pub const VIRTIO_ID_FS: u32 = 26; +pub const VIRTIO_ID_PMEM: u32 = 27; +pub const VIRTIO_ID_RPMB: u32 = 28; +pub const VIRTIO_ID_MAC80211_HWSIM: u32 = 29; +pub const VIRTIO_ID_VIDEO_ENCODER: u32 = 30; +pub const VIRTIO_ID_VIDEO_DECODER: u32 = 31; +pub const VIRTIO_ID_SCMI: u32 = 32; +pub const VIRTIO_ID_NITRO_SEC_MOD: u32 = 33; +pub const VIRTIO_ID_I2C_ADAPTER: u32 = 34; +pub const VIRTIO_ID_WATCHDOG: u32 = 35; +pub const VIRTIO_ID_CAN: u32 = 36; +pub const VIRTIO_ID_DMABUF: u32 = 37; +pub const VIRTIO_ID_PARAM_SERV: u32 = 38; +pub const VIRTIO_ID_AUDIO_POLICY: u32 = 39; +pub const VIRTIO_ID_BT: u32 = 40; +pub const VIRTIO_ID_GPIO: u32 = 41; +pub const VIRTIO_TRANS_ID_NET: u32 = 4096; +pub const VIRTIO_TRANS_ID_BLOCK: u32 = 4097; +pub const VIRTIO_TRANS_ID_BALLOON: u32 = 4098; +pub const VIRTIO_TRANS_ID_CONSOLE: u32 = 4099; +pub const VIRTIO_TRANS_ID_SCSI: u32 = 4100; +pub const VIRTIO_TRANS_ID_RNG: u32 = 4101; +pub const VIRTIO_TRANS_ID_9P: u32 = 4105; diff --git a/src/virtio_net/generated.rs b/src/virtio_net/generated.rs index 326dbe5..c8f5b2b 100644 --- a/src/virtio_net/generated.rs +++ b/src/virtio_net/generated.rs @@ -57,6 +57,7 @@ pub const VIRTIO_NET_F_GUEST_USO4: u32 = 54; pub const VIRTIO_NET_F_GUEST_USO6: u32 = 55; pub const VIRTIO_NET_F_HOST_USO: u32 = 56; pub const VIRTIO_NET_F_HASH_REPORT: u32 = 57; +pub const VIRTIO_NET_F_GUEST_HDRLEN: u32 = 59; pub const VIRTIO_NET_F_RSS: u32 = 60; pub const VIRTIO_NET_F_RSC_EXT: u32 = 61; pub const VIRTIO_NET_F_STANDBY: u32 = 62; |