diff --git a/Cargo.lock b/Cargo.lock index 1e5b5055c..bb9d353fb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -984,6 +984,7 @@ dependencies = [ [[package]] name = "virtio-bindings" version = "0.1.0" +source = "git+https://github.com/rust-vmm/virtio-bindings#c5676476f1048d212f53ca80711d2b132dcebe23" [[package]] name = "vm-allocator" @@ -1017,7 +1018,7 @@ dependencies = [ "pci 0.1.0", "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "vhost_rs 0.1.0", - "virtio-bindings 0.1.0", + "virtio-bindings 0.1.0 (git+https://github.com/rust-vmm/virtio-bindings)", "vm-allocator 0.1.0", "vm-memory 0.1.0 (git+https://github.com/rust-vmm/vm-memory)", "vmm-sys-util 0.1.0 (git+https://github.com/rust-vmm/vmm-sys-util)", @@ -1203,6 +1204,7 @@ dependencies = [ "checksum utf8-ranges 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b4ae116fef2b7fea257ed6440d3cfcff7f190865f170cdad00bb6465bf18ecba" "checksum vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "33dd455d0f96e90a75803cfeb7f948768c08d70a6de9a8d2362461935698bf95" "checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" +"checksum virtio-bindings 0.1.0 (git+https://github.com/rust-vmm/virtio-bindings)" = "" "checksum vm-memory 0.1.0 (git+https://github.com/rust-vmm/vm-memory)" = "" "checksum vmm-sys-util 0.1.0 (git+https://github.com/rust-vmm/vmm-sys-util)" = "" "checksum wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d" diff --git a/virtio-bindings/Cargo.toml b/virtio-bindings/Cargo.toml deleted file mode 100644 index ca36faf2d..000000000 --- a/virtio-bindings/Cargo.toml +++ /dev/null @@ -1,6 +0,0 @@ -[package] -name = "virtio-bindings" -version = "0.1.0" -authors = ["The Chromium OS Authors"] - -[dependencies] diff --git a/virtio-bindings/patches/0001-virtio_gen-remove-derive-Debug-from-packed-struct.patch b/virtio-bindings/patches/0001-virtio_gen-remove-derive-Debug-from-packed-struct.patch deleted file mode 100644 index 8cce23e55..000000000 --- a/virtio-bindings/patches/0001-virtio_gen-remove-derive-Debug-from-packed-struct.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 67247b7abc56a11d8cae7eb354994d818fb72e93 Mon Sep 17 00:00:00 2001 -From: Andreea Florescu -Date: Tue, 15 Jan 2019 18:30:07 +0200 -Subject: [PATCH] virtio_gen: remove derive Debug from packed struct - -Bindgen automatically adds derive debug on virtio_net_ctrl_mac, a packed -structure. This generates a warning while building. - -Manually remove the Debug derive. - -Signed-off-by: Andreea Florescu ---- - virtio_gen/src/virtio_net.rs | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/virtio_gen/src/virtio_net.rs b/virtio_gen/src/virtio_net.rs -index 0b68d09..a1c9dca 100644 ---- a/virtio_gen/src/virtio_net.rs -+++ b/virtio_gen/src/virtio_net.rs -@@ -681,7 +681,7 @@ fn bindgen_test_layout_virtio_net_ctrl_hdr() { - } - pub type virtio_net_ctrl_ack = __u8; - #[repr(C, packed)] --#[derive(Debug, Default)] -+#[derive(Default)] - pub struct virtio_net_ctrl_mac { - pub entries: __virtio32, - pub macs: __IncompleteArrayField<[__u8; 6usize]>, --- -2.7.4 - diff --git a/virtio-bindings/src/lib.rs b/virtio-bindings/src/lib.rs deleted file mode 100644 index db5328666..000000000 --- a/virtio-bindings/src/lib.rs +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved. -// SPDX-License-Identifier: Apache-2.0 -// -// Portions Copyright 2017 The Chromium OS Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE-BSD-3-Clause file. - -#![allow(clippy::all)] -#![allow(non_upper_case_globals)] -#![allow(non_camel_case_types)] -#![allow(non_snake_case)] - -pub mod virtio_blk; -pub mod virtio_net; -pub mod virtio_ring; diff --git a/virtio-bindings/src/virtio_blk.rs b/virtio-bindings/src/virtio_blk.rs deleted file mode 100644 index fcd5a5d72..000000000 --- a/virtio-bindings/src/virtio_blk.rs +++ /dev/null @@ -1,486 +0,0 @@ -// Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. -// SPDX-License-Identifier: Apache-2.0 - -/* automatically generated by rust-bindgen */ - -pub const __BITS_PER_LONG: u32 = 64; -pub const __FD_SETSIZE: u32 = 1024; -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_RPMSG: u32 = 7; -pub const VIRTIO_ID_SCSI: u32 = 8; -pub const VIRTIO_ID_9P: u32 = 9; -pub const VIRTIO_ID_RPROC_SERIAL: u32 = 11; -pub const VIRTIO_ID_CAIF: u32 = 12; -pub const VIRTIO_ID_GPU: u32 = 16; -pub const VIRTIO_ID_INPUT: u32 = 18; -pub const VIRTIO_CONFIG_S_ACKNOWLEDGE: u32 = 1; -pub const VIRTIO_CONFIG_S_DRIVER: u32 = 2; -pub const VIRTIO_CONFIG_S_DRIVER_OK: u32 = 4; -pub const VIRTIO_CONFIG_S_FEATURES_OK: u32 = 8; -pub const VIRTIO_CONFIG_S_FAILED: u32 = 128; -pub const VIRTIO_TRANSPORT_F_START: u32 = 28; -pub const VIRTIO_TRANSPORT_F_END: u32 = 33; -pub const VIRTIO_F_NOTIFY_ON_EMPTY: u32 = 24; -pub const VIRTIO_F_ANY_LAYOUT: u32 = 27; -pub const VIRTIO_F_VERSION_1: u32 = 32; -pub const VIRTIO_BLK_F_SIZE_MAX: u32 = 1; -pub const VIRTIO_BLK_F_SEG_MAX: u32 = 2; -pub const VIRTIO_BLK_F_GEOMETRY: u32 = 4; -pub const VIRTIO_BLK_F_RO: u32 = 5; -pub const VIRTIO_BLK_F_BLK_SIZE: u32 = 6; -pub const VIRTIO_BLK_F_TOPOLOGY: u32 = 10; -pub const VIRTIO_BLK_F_MQ: u32 = 12; -pub const VIRTIO_BLK_F_BARRIER: u32 = 0; -pub const VIRTIO_BLK_F_SCSI: u32 = 7; -pub const VIRTIO_BLK_F_FLUSH: u32 = 9; -pub const VIRTIO_BLK_F_CONFIG_WCE: u32 = 11; -pub const VIRTIO_BLK_F_WCE: u32 = 9; -pub const VIRTIO_BLK_ID_BYTES: u32 = 20; -pub const VIRTIO_BLK_T_IN: u32 = 0; -pub const VIRTIO_BLK_T_OUT: u32 = 1; -pub const VIRTIO_BLK_T_SCSI_CMD: u32 = 2; -pub const VIRTIO_BLK_T_FLUSH: u32 = 4; -pub const VIRTIO_BLK_T_GET_ID: u32 = 8; -pub const VIRTIO_BLK_T_BARRIER: u32 = 2147483648; -pub const VIRTIO_BLK_S_OK: u32 = 0; -pub const VIRTIO_BLK_S_IOERR: u32 = 1; -pub const VIRTIO_BLK_S_UNSUPP: u32 = 2; -pub type __s8 = ::std::os::raw::c_schar; -pub type __u8 = ::std::os::raw::c_uchar; -pub type __s16 = ::std::os::raw::c_short; -pub type __u16 = ::std::os::raw::c_ushort; -pub type __s32 = ::std::os::raw::c_int; -pub type __u32 = ::std::os::raw::c_uint; -pub type __s64 = ::std::os::raw::c_longlong; -pub type __u64 = ::std::os::raw::c_ulonglong; -#[repr(C)] -#[derive(Debug, Default, Copy, Clone, PartialEq)] -pub struct __kernel_fd_set { - pub fds_bits: [::std::os::raw::c_ulong; 16usize], -} -#[test] -fn bindgen_test_layout___kernel_fd_set() { - assert_eq!( - ::std::mem::size_of::<__kernel_fd_set>(), - 128usize, - concat!("Size of: ", stringify!(__kernel_fd_set)) - ); - assert_eq!( - ::std::mem::align_of::<__kernel_fd_set>(), - 8usize, - concat!("Alignment of ", stringify!(__kernel_fd_set)) - ); - assert_eq!( - unsafe { &(*(::std::ptr::null::<__kernel_fd_set>())).fds_bits as *const _ as usize }, - 0usize, - concat!( - "Offset of field: ", - stringify!(__kernel_fd_set), - "::", - stringify!(fds_bits) - ) - ); -} -pub type __kernel_sighandler_t = - ::std::option::Option; -pub type __kernel_key_t = ::std::os::raw::c_int; -pub type __kernel_mqd_t = ::std::os::raw::c_int; -pub type __kernel_old_uid_t = ::std::os::raw::c_ushort; -pub type __kernel_old_gid_t = ::std::os::raw::c_ushort; -pub type __kernel_old_dev_t = ::std::os::raw::c_ulong; -pub type __kernel_long_t = ::std::os::raw::c_long; -pub type __kernel_ulong_t = ::std::os::raw::c_ulong; -pub type __kernel_ino_t = __kernel_ulong_t; -pub type __kernel_mode_t = ::std::os::raw::c_uint; -pub type __kernel_pid_t = ::std::os::raw::c_int; -pub type __kernel_ipc_pid_t = ::std::os::raw::c_int; -pub type __kernel_uid_t = ::std::os::raw::c_uint; -pub type __kernel_gid_t = ::std::os::raw::c_uint; -pub type __kernel_suseconds_t = __kernel_long_t; -pub type __kernel_daddr_t = ::std::os::raw::c_int; -pub type __kernel_uid32_t = ::std::os::raw::c_uint; -pub type __kernel_gid32_t = ::std::os::raw::c_uint; -pub type __kernel_size_t = __kernel_ulong_t; -pub type __kernel_ssize_t = __kernel_long_t; -pub type __kernel_ptrdiff_t = __kernel_long_t; -#[repr(C)] -#[derive(Debug, Default, Copy, Clone, PartialEq)] -pub struct __kernel_fsid_t { - pub val: [::std::os::raw::c_int; 2usize], -} -#[test] -fn bindgen_test_layout___kernel_fsid_t() { - assert_eq!( - ::std::mem::size_of::<__kernel_fsid_t>(), - 8usize, - concat!("Size of: ", stringify!(__kernel_fsid_t)) - ); - assert_eq!( - ::std::mem::align_of::<__kernel_fsid_t>(), - 4usize, - concat!("Alignment of ", stringify!(__kernel_fsid_t)) - ); - assert_eq!( - unsafe { &(*(::std::ptr::null::<__kernel_fsid_t>())).val as *const _ as usize }, - 0usize, - concat!( - "Offset of field: ", - stringify!(__kernel_fsid_t), - "::", - stringify!(val) - ) - ); -} -pub type __kernel_off_t = __kernel_long_t; -pub type __kernel_loff_t = ::std::os::raw::c_longlong; -pub type __kernel_time_t = __kernel_long_t; -pub type __kernel_clock_t = __kernel_long_t; -pub type __kernel_timer_t = ::std::os::raw::c_int; -pub type __kernel_clockid_t = ::std::os::raw::c_int; -pub type __kernel_caddr_t = *mut ::std::os::raw::c_char; -pub type __kernel_uid16_t = ::std::os::raw::c_ushort; -pub type __kernel_gid16_t = ::std::os::raw::c_ushort; -pub type __le16 = __u16; -pub type __be16 = __u16; -pub type __le32 = __u32; -pub type __be32 = __u32; -pub type __le64 = __u64; -pub type __be64 = __u64; -pub type __sum16 = __u16; -pub type __wsum = __u32; -pub type __virtio16 = __u16; -pub type __virtio32 = __u32; -pub type __virtio64 = __u64; -#[repr(C, packed)] -#[derive(Debug, Default, Copy, Clone, PartialEq)] -pub struct virtio_blk_config { - pub capacity: __u64, - pub size_max: __u32, - pub seg_max: __u32, - pub geometry: virtio_blk_config_virtio_blk_geometry, - pub blk_size: __u32, - pub physical_block_exp: __u8, - pub alignment_offset: __u8, - pub min_io_size: __u16, - pub opt_io_size: __u32, - pub wce: __u8, - pub unused: __u8, - pub num_queues: __u16, -} -#[repr(C)] -#[derive(Debug, Default, Copy, Clone, PartialEq)] -pub struct virtio_blk_config_virtio_blk_geometry { - pub cylinders: __u16, - pub heads: __u8, - pub sectors: __u8, -} -#[test] -fn bindgen_test_layout_virtio_blk_config_virtio_blk_geometry() { - assert_eq!( - ::std::mem::size_of::(), - 4usize, - concat!( - "Size of: ", - stringify!(virtio_blk_config_virtio_blk_geometry) - ) - ); - assert_eq!( - ::std::mem::align_of::(), - 2usize, - concat!( - "Alignment of ", - stringify!(virtio_blk_config_virtio_blk_geometry) - ) - ); - assert_eq!( - unsafe { - &(*(::std::ptr::null::())).cylinders as *const _ - as usize - }, - 0usize, - concat!( - "Offset of field: ", - stringify!(virtio_blk_config_virtio_blk_geometry), - "::", - stringify!(cylinders) - ) - ); - assert_eq!( - unsafe { - &(*(::std::ptr::null::())).heads as *const _ - as usize - }, - 2usize, - concat!( - "Offset of field: ", - stringify!(virtio_blk_config_virtio_blk_geometry), - "::", - stringify!(heads) - ) - ); - assert_eq!( - unsafe { - &(*(::std::ptr::null::())).sectors as *const _ - as usize - }, - 3usize, - concat!( - "Offset of field: ", - stringify!(virtio_blk_config_virtio_blk_geometry), - "::", - stringify!(sectors) - ) - ); -} -#[test] -fn bindgen_test_layout_virtio_blk_config() { - assert_eq!( - ::std::mem::size_of::(), - 36usize, - concat!("Size of: ", stringify!(virtio_blk_config)) - ); - assert_eq!( - ::std::mem::align_of::(), - 1usize, - concat!("Alignment of ", stringify!(virtio_blk_config)) - ); - assert_eq!( - unsafe { &(*(::std::ptr::null::())).capacity as *const _ as usize }, - 0usize, - concat!( - "Offset of field: ", - stringify!(virtio_blk_config), - "::", - stringify!(capacity) - ) - ); - assert_eq!( - unsafe { &(*(::std::ptr::null::())).size_max as *const _ as usize }, - 8usize, - concat!( - "Offset of field: ", - stringify!(virtio_blk_config), - "::", - stringify!(size_max) - ) - ); - assert_eq!( - unsafe { &(*(::std::ptr::null::())).seg_max as *const _ as usize }, - 12usize, - concat!( - "Offset of field: ", - stringify!(virtio_blk_config), - "::", - stringify!(seg_max) - ) - ); - assert_eq!( - unsafe { &(*(::std::ptr::null::())).geometry as *const _ as usize }, - 16usize, - concat!( - "Offset of field: ", - stringify!(virtio_blk_config), - "::", - stringify!(geometry) - ) - ); - assert_eq!( - unsafe { &(*(::std::ptr::null::())).blk_size as *const _ as usize }, - 20usize, - concat!( - "Offset of field: ", - stringify!(virtio_blk_config), - "::", - stringify!(blk_size) - ) - ); - assert_eq!( - unsafe { - &(*(::std::ptr::null::())).physical_block_exp as *const _ as usize - }, - 24usize, - concat!( - "Offset of field: ", - stringify!(virtio_blk_config), - "::", - stringify!(physical_block_exp) - ) - ); - assert_eq!( - unsafe { - &(*(::std::ptr::null::())).alignment_offset as *const _ as usize - }, - 25usize, - concat!( - "Offset of field: ", - stringify!(virtio_blk_config), - "::", - stringify!(alignment_offset) - ) - ); - assert_eq!( - unsafe { &(*(::std::ptr::null::())).min_io_size as *const _ as usize }, - 26usize, - concat!( - "Offset of field: ", - stringify!(virtio_blk_config), - "::", - stringify!(min_io_size) - ) - ); - assert_eq!( - unsafe { &(*(::std::ptr::null::())).opt_io_size as *const _ as usize }, - 28usize, - concat!( - "Offset of field: ", - stringify!(virtio_blk_config), - "::", - stringify!(opt_io_size) - ) - ); - assert_eq!( - unsafe { &(*(::std::ptr::null::())).wce as *const _ as usize }, - 32usize, - concat!( - "Offset of field: ", - stringify!(virtio_blk_config), - "::", - stringify!(wce) - ) - ); - assert_eq!( - unsafe { &(*(::std::ptr::null::())).unused as *const _ as usize }, - 33usize, - concat!( - "Offset of field: ", - stringify!(virtio_blk_config), - "::", - stringify!(unused) - ) - ); - assert_eq!( - unsafe { &(*(::std::ptr::null::())).num_queues as *const _ as usize }, - 34usize, - concat!( - "Offset of field: ", - stringify!(virtio_blk_config), - "::", - stringify!(num_queues) - ) - ); -} -#[repr(C)] -#[derive(Debug, Default, Copy, Clone, PartialEq)] -pub struct virtio_blk_outhdr { - pub type_: __virtio32, - pub ioprio: __virtio32, - pub sector: __virtio64, -} -#[test] -fn bindgen_test_layout_virtio_blk_outhdr() { - assert_eq!( - ::std::mem::size_of::(), - 16usize, - concat!("Size of: ", stringify!(virtio_blk_outhdr)) - ); - assert_eq!( - ::std::mem::align_of::(), - 8usize, - concat!("Alignment of ", stringify!(virtio_blk_outhdr)) - ); - assert_eq!( - unsafe { &(*(::std::ptr::null::())).type_ as *const _ as usize }, - 0usize, - concat!( - "Offset of field: ", - stringify!(virtio_blk_outhdr), - "::", - stringify!(type_) - ) - ); - assert_eq!( - unsafe { &(*(::std::ptr::null::())).ioprio as *const _ as usize }, - 4usize, - concat!( - "Offset of field: ", - stringify!(virtio_blk_outhdr), - "::", - stringify!(ioprio) - ) - ); - assert_eq!( - unsafe { &(*(::std::ptr::null::())).sector as *const _ as usize }, - 8usize, - concat!( - "Offset of field: ", - stringify!(virtio_blk_outhdr), - "::", - stringify!(sector) - ) - ); -} -#[repr(C)] -#[derive(Debug, Default, Copy, Clone, PartialEq)] -pub struct virtio_scsi_inhdr { - pub errors: __virtio32, - pub data_len: __virtio32, - pub sense_len: __virtio32, - pub residual: __virtio32, -} -#[test] -fn bindgen_test_layout_virtio_scsi_inhdr() { - assert_eq!( - ::std::mem::size_of::(), - 16usize, - concat!("Size of: ", stringify!(virtio_scsi_inhdr)) - ); - assert_eq!( - ::std::mem::align_of::(), - 4usize, - concat!("Alignment of ", stringify!(virtio_scsi_inhdr)) - ); - assert_eq!( - unsafe { &(*(::std::ptr::null::())).errors as *const _ as usize }, - 0usize, - concat!( - "Offset of field: ", - stringify!(virtio_scsi_inhdr), - "::", - stringify!(errors) - ) - ); - assert_eq!( - unsafe { &(*(::std::ptr::null::())).data_len as *const _ as usize }, - 4usize, - concat!( - "Offset of field: ", - stringify!(virtio_scsi_inhdr), - "::", - stringify!(data_len) - ) - ); - assert_eq!( - unsafe { &(*(::std::ptr::null::())).sense_len as *const _ as usize }, - 8usize, - concat!( - "Offset of field: ", - stringify!(virtio_scsi_inhdr), - "::", - stringify!(sense_len) - ) - ); - assert_eq!( - unsafe { &(*(::std::ptr::null::())).residual as *const _ as usize }, - 12usize, - concat!( - "Offset of field: ", - stringify!(virtio_scsi_inhdr), - "::", - stringify!(residual) - ) - ); -} diff --git a/virtio-bindings/src/virtio_net.rs b/virtio-bindings/src/virtio_net.rs deleted file mode 100644 index ebcfe54ad..000000000 --- a/virtio-bindings/src/virtio_net.rs +++ /dev/null @@ -1,734 +0,0 @@ -// Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. -// SPDX-License-Identifier: Apache-2.0 - -/* automatically generated by rust-bindgen */ - -#[repr(C)] -#[derive(Default)] -pub struct __IncompleteArrayField(::std::marker::PhantomData, [T; 0]); -impl __IncompleteArrayField { - #[inline] - pub fn new() -> Self { - __IncompleteArrayField(::std::marker::PhantomData, []) - } - #[inline] - pub unsafe fn as_ptr(&self) -> *const T { - ::std::mem::transmute(self) - } - #[inline] - pub unsafe fn as_mut_ptr(&mut self) -> *mut T { - ::std::mem::transmute(self) - } - #[inline] - pub unsafe fn as_slice(&self, len: usize) -> &[T] { - ::std::slice::from_raw_parts(self.as_ptr(), len) - } - #[inline] - pub unsafe fn as_mut_slice(&mut self, len: usize) -> &mut [T] { - ::std::slice::from_raw_parts_mut(self.as_mut_ptr(), len) - } -} -impl ::std::fmt::Debug for __IncompleteArrayField { - fn fmt(&self, fmt: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { - fmt.write_str("__IncompleteArrayField") - } -} -impl ::std::clone::Clone for __IncompleteArrayField { - #[inline] - fn clone(&self) -> Self { - Self::new() - } -} -pub const __BITS_PER_LONG: u32 = 64; -pub const __FD_SETSIZE: u32 = 1024; -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_RPMSG: u32 = 7; -pub const VIRTIO_ID_SCSI: u32 = 8; -pub const VIRTIO_ID_9P: u32 = 9; -pub const VIRTIO_ID_RPROC_SERIAL: u32 = 11; -pub const VIRTIO_ID_CAIF: u32 = 12; -pub const VIRTIO_ID_GPU: u32 = 16; -pub const VIRTIO_ID_INPUT: u32 = 18; -pub const VIRTIO_CONFIG_S_ACKNOWLEDGE: u32 = 1; -pub const VIRTIO_CONFIG_S_DRIVER: u32 = 2; -pub const VIRTIO_CONFIG_S_DRIVER_OK: u32 = 4; -pub const VIRTIO_CONFIG_S_FEATURES_OK: u32 = 8; -pub const VIRTIO_CONFIG_S_FAILED: u32 = 128; -pub const VIRTIO_TRANSPORT_F_START: u32 = 28; -pub const VIRTIO_TRANSPORT_F_END: u32 = 33; -pub const VIRTIO_F_NOTIFY_ON_EMPTY: u32 = 24; -pub const VIRTIO_F_ANY_LAYOUT: u32 = 27; -pub const VIRTIO_F_VERSION_1: u32 = 32; -pub const ETH_ALEN: u32 = 6; -pub const ETH_TLEN: u32 = 2; -pub const ETH_HLEN: u32 = 14; -pub const ETH_ZLEN: u32 = 60; -pub const ETH_DATA_LEN: u32 = 1500; -pub const ETH_FRAME_LEN: u32 = 1514; -pub const ETH_FCS_LEN: u32 = 4; -pub const ETH_P_LOOP: u32 = 96; -pub const ETH_P_PUP: u32 = 512; -pub const ETH_P_PUPAT: u32 = 513; -pub const ETH_P_TSN: u32 = 8944; -pub const ETH_P_IP: u32 = 2048; -pub const ETH_P_X25: u32 = 2053; -pub const ETH_P_ARP: u32 = 2054; -pub const ETH_P_BPQ: u32 = 2303; -pub const ETH_P_IEEEPUP: u32 = 2560; -pub const ETH_P_IEEEPUPAT: u32 = 2561; -pub const ETH_P_BATMAN: u32 = 17157; -pub const ETH_P_DEC: u32 = 24576; -pub const ETH_P_DNA_DL: u32 = 24577; -pub const ETH_P_DNA_RC: u32 = 24578; -pub const ETH_P_DNA_RT: u32 = 24579; -pub const ETH_P_LAT: u32 = 24580; -pub const ETH_P_DIAG: u32 = 24581; -pub const ETH_P_CUST: u32 = 24582; -pub const ETH_P_SCA: u32 = 24583; -pub const ETH_P_TEB: u32 = 25944; -pub const ETH_P_RARP: u32 = 32821; -pub const ETH_P_ATALK: u32 = 32923; -pub const ETH_P_AARP: u32 = 33011; -pub const ETH_P_8021Q: u32 = 33024; -pub const ETH_P_IPX: u32 = 33079; -pub const ETH_P_IPV6: u32 = 34525; -pub const ETH_P_PAUSE: u32 = 34824; -pub const ETH_P_SLOW: u32 = 34825; -pub const ETH_P_WCCP: u32 = 34878; -pub const ETH_P_MPLS_UC: u32 = 34887; -pub const ETH_P_MPLS_MC: u32 = 34888; -pub const ETH_P_ATMMPOA: u32 = 34892; -pub const ETH_P_PPP_DISC: u32 = 34915; -pub const ETH_P_PPP_SES: u32 = 34916; -pub const ETH_P_LINK_CTL: u32 = 34924; -pub const ETH_P_ATMFATE: u32 = 34948; -pub const ETH_P_PAE: u32 = 34958; -pub const ETH_P_AOE: u32 = 34978; -pub const ETH_P_8021AD: u32 = 34984; -pub const ETH_P_802_EX1: u32 = 34997; -pub const ETH_P_TIPC: u32 = 35018; -pub const ETH_P_8021AH: u32 = 35047; -pub const ETH_P_MVRP: u32 = 35061; -pub const ETH_P_1588: u32 = 35063; -pub const ETH_P_PRP: u32 = 35067; -pub const ETH_P_FCOE: u32 = 35078; -pub const ETH_P_TDLS: u32 = 35085; -pub const ETH_P_FIP: u32 = 35092; -pub const ETH_P_80221: u32 = 35095; -pub const ETH_P_LOOPBACK: u32 = 36864; -pub const ETH_P_QINQ1: u32 = 37120; -pub const ETH_P_QINQ2: u32 = 37376; -pub const ETH_P_QINQ3: u32 = 37632; -pub const ETH_P_EDSA: u32 = 56026; -pub const ETH_P_AF_IUCV: u32 = 64507; -pub const ETH_P_802_3_MIN: u32 = 1536; -pub const ETH_P_802_3: u32 = 1; -pub const ETH_P_AX25: u32 = 2; -pub const ETH_P_ALL: u32 = 3; -pub const ETH_P_802_2: u32 = 4; -pub const ETH_P_SNAP: u32 = 5; -pub const ETH_P_DDCMP: u32 = 6; -pub const ETH_P_WAN_PPP: u32 = 7; -pub const ETH_P_PPP_MP: u32 = 8; -pub const ETH_P_LOCALTALK: u32 = 9; -pub const ETH_P_CAN: u32 = 12; -pub const ETH_P_CANFD: u32 = 13; -pub const ETH_P_PPPTALK: u32 = 16; -pub const ETH_P_TR_802_2: u32 = 17; -pub const ETH_P_MOBITEX: u32 = 21; -pub const ETH_P_CONTROL: u32 = 22; -pub const ETH_P_IRDA: u32 = 23; -pub const ETH_P_ECONET: u32 = 24; -pub const ETH_P_HDLC: u32 = 25; -pub const ETH_P_ARCNET: u32 = 26; -pub const ETH_P_DSA: u32 = 27; -pub const ETH_P_TRAILER: u32 = 28; -pub const ETH_P_PHONET: u32 = 245; -pub const ETH_P_IEEE802154: u32 = 246; -pub const ETH_P_CAIF: u32 = 247; -pub const ETH_P_XDSA: u32 = 248; -pub const VIRTIO_NET_F_CSUM: u32 = 0; -pub const VIRTIO_NET_F_GUEST_CSUM: u32 = 1; -pub const VIRTIO_NET_F_CTRL_GUEST_OFFLOADS: u32 = 2; -pub const VIRTIO_NET_F_MTU: u32 = 3; -pub const VIRTIO_NET_F_MAC: u32 = 5; -pub const VIRTIO_NET_F_GUEST_TSO4: u32 = 7; -pub const VIRTIO_NET_F_GUEST_TSO6: u32 = 8; -pub const VIRTIO_NET_F_GUEST_ECN: u32 = 9; -pub const VIRTIO_NET_F_GUEST_UFO: u32 = 10; -pub const VIRTIO_NET_F_HOST_TSO4: u32 = 11; -pub const VIRTIO_NET_F_HOST_TSO6: u32 = 12; -pub const VIRTIO_NET_F_HOST_ECN: u32 = 13; -pub const VIRTIO_NET_F_HOST_UFO: u32 = 14; -pub const VIRTIO_NET_F_MRG_RXBUF: u32 = 15; -pub const VIRTIO_NET_F_STATUS: u32 = 16; -pub const VIRTIO_NET_F_CTRL_VQ: u32 = 17; -pub const VIRTIO_NET_F_CTRL_RX: u32 = 18; -pub const VIRTIO_NET_F_CTRL_VLAN: u32 = 19; -pub const VIRTIO_NET_F_CTRL_RX_EXTRA: u32 = 20; -pub const VIRTIO_NET_F_GUEST_ANNOUNCE: u32 = 21; -pub const VIRTIO_NET_F_MQ: u32 = 22; -pub const VIRTIO_NET_F_CTRL_MAC_ADDR: u32 = 23; -pub const VIRTIO_NET_F_GSO: u32 = 6; -pub const VIRTIO_NET_S_LINK_UP: u32 = 1; -pub const VIRTIO_NET_S_ANNOUNCE: u32 = 2; -pub const VIRTIO_NET_HDR_F_NEEDS_CSUM: u32 = 1; -pub const VIRTIO_NET_HDR_F_DATA_VALID: u32 = 2; -pub const VIRTIO_NET_HDR_GSO_NONE: u32 = 0; -pub const VIRTIO_NET_HDR_GSO_TCPV4: u32 = 1; -pub const VIRTIO_NET_HDR_GSO_UDP: u32 = 3; -pub const VIRTIO_NET_HDR_GSO_TCPV6: u32 = 4; -pub const VIRTIO_NET_HDR_GSO_ECN: u32 = 128; -pub const VIRTIO_NET_OK: u32 = 0; -pub const VIRTIO_NET_ERR: u32 = 1; -pub const VIRTIO_NET_CTRL_RX: u32 = 0; -pub const VIRTIO_NET_CTRL_RX_PROMISC: u32 = 0; -pub const VIRTIO_NET_CTRL_RX_ALLMULTI: u32 = 1; -pub const VIRTIO_NET_CTRL_RX_ALLUNI: u32 = 2; -pub const VIRTIO_NET_CTRL_RX_NOMULTI: u32 = 3; -pub const VIRTIO_NET_CTRL_RX_NOUNI: u32 = 4; -pub const VIRTIO_NET_CTRL_RX_NOBCAST: u32 = 5; -pub const VIRTIO_NET_CTRL_MAC: u32 = 1; -pub const VIRTIO_NET_CTRL_MAC_TABLE_SET: u32 = 0; -pub const VIRTIO_NET_CTRL_MAC_ADDR_SET: u32 = 1; -pub const VIRTIO_NET_CTRL_VLAN: u32 = 2; -pub const VIRTIO_NET_CTRL_VLAN_ADD: u32 = 0; -pub const VIRTIO_NET_CTRL_VLAN_DEL: u32 = 1; -pub const VIRTIO_NET_CTRL_ANNOUNCE: u32 = 3; -pub const VIRTIO_NET_CTRL_ANNOUNCE_ACK: u32 = 0; -pub const VIRTIO_NET_CTRL_MQ: u32 = 4; -pub const VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET: u32 = 0; -pub const VIRTIO_NET_CTRL_MQ_VQ_PAIRS_MIN: u32 = 1; -pub const VIRTIO_NET_CTRL_MQ_VQ_PAIRS_MAX: u32 = 32768; -pub const VIRTIO_NET_CTRL_GUEST_OFFLOADS: u32 = 5; -pub const VIRTIO_NET_CTRL_GUEST_OFFLOADS_SET: u32 = 0; -pub type __s8 = ::std::os::raw::c_schar; -pub type __u8 = ::std::os::raw::c_uchar; -pub type __s16 = ::std::os::raw::c_short; -pub type __u16 = ::std::os::raw::c_ushort; -pub type __s32 = ::std::os::raw::c_int; -pub type __u32 = ::std::os::raw::c_uint; -pub type __s64 = ::std::os::raw::c_longlong; -pub type __u64 = ::std::os::raw::c_ulonglong; -#[repr(C)] -#[derive(Debug, Default, Copy, Clone, PartialEq)] -pub struct __kernel_fd_set { - pub fds_bits: [::std::os::raw::c_ulong; 16usize], -} -#[test] -fn bindgen_test_layout___kernel_fd_set() { - assert_eq!( - ::std::mem::size_of::<__kernel_fd_set>(), - 128usize, - concat!("Size of: ", stringify!(__kernel_fd_set)) - ); - assert_eq!( - ::std::mem::align_of::<__kernel_fd_set>(), - 8usize, - concat!("Alignment of ", stringify!(__kernel_fd_set)) - ); - assert_eq!( - unsafe { &(*(::std::ptr::null::<__kernel_fd_set>())).fds_bits as *const _ as usize }, - 0usize, - concat!( - "Offset of field: ", - stringify!(__kernel_fd_set), - "::", - stringify!(fds_bits) - ) - ); -} -pub type __kernel_sighandler_t = - ::std::option::Option; -pub type __kernel_key_t = ::std::os::raw::c_int; -pub type __kernel_mqd_t = ::std::os::raw::c_int; -pub type __kernel_old_uid_t = ::std::os::raw::c_ushort; -pub type __kernel_old_gid_t = ::std::os::raw::c_ushort; -pub type __kernel_old_dev_t = ::std::os::raw::c_ulong; -pub type __kernel_long_t = ::std::os::raw::c_long; -pub type __kernel_ulong_t = ::std::os::raw::c_ulong; -pub type __kernel_ino_t = __kernel_ulong_t; -pub type __kernel_mode_t = ::std::os::raw::c_uint; -pub type __kernel_pid_t = ::std::os::raw::c_int; -pub type __kernel_ipc_pid_t = ::std::os::raw::c_int; -pub type __kernel_uid_t = ::std::os::raw::c_uint; -pub type __kernel_gid_t = ::std::os::raw::c_uint; -pub type __kernel_suseconds_t = __kernel_long_t; -pub type __kernel_daddr_t = ::std::os::raw::c_int; -pub type __kernel_uid32_t = ::std::os::raw::c_uint; -pub type __kernel_gid32_t = ::std::os::raw::c_uint; -pub type __kernel_size_t = __kernel_ulong_t; -pub type __kernel_ssize_t = __kernel_long_t; -pub type __kernel_ptrdiff_t = __kernel_long_t; -#[repr(C)] -#[derive(Debug, Default, Copy, Clone, PartialEq)] -pub struct __kernel_fsid_t { - pub val: [::std::os::raw::c_int; 2usize], -} -#[test] -fn bindgen_test_layout___kernel_fsid_t() { - assert_eq!( - ::std::mem::size_of::<__kernel_fsid_t>(), - 8usize, - concat!("Size of: ", stringify!(__kernel_fsid_t)) - ); - assert_eq!( - ::std::mem::align_of::<__kernel_fsid_t>(), - 4usize, - concat!("Alignment of ", stringify!(__kernel_fsid_t)) - ); - assert_eq!( - unsafe { &(*(::std::ptr::null::<__kernel_fsid_t>())).val as *const _ as usize }, - 0usize, - concat!( - "Offset of field: ", - stringify!(__kernel_fsid_t), - "::", - stringify!(val) - ) - ); -} -pub type __kernel_off_t = __kernel_long_t; -pub type __kernel_loff_t = ::std::os::raw::c_longlong; -pub type __kernel_time_t = __kernel_long_t; -pub type __kernel_clock_t = __kernel_long_t; -pub type __kernel_timer_t = ::std::os::raw::c_int; -pub type __kernel_clockid_t = ::std::os::raw::c_int; -pub type __kernel_caddr_t = *mut ::std::os::raw::c_char; -pub type __kernel_uid16_t = ::std::os::raw::c_ushort; -pub type __kernel_gid16_t = ::std::os::raw::c_ushort; -pub type __le16 = __u16; -pub type __be16 = __u16; -pub type __le32 = __u32; -pub type __be32 = __u32; -pub type __le64 = __u64; -pub type __be64 = __u64; -pub type __sum16 = __u16; -pub type __wsum = __u32; -pub type __virtio16 = __u16; -pub type __virtio32 = __u32; -pub type __virtio64 = __u64; -#[repr(C, packed)] -#[derive(Debug, Default, Copy, Clone, PartialEq)] -pub struct ethhdr { - pub h_dest: [::std::os::raw::c_uchar; 6usize], - pub h_source: [::std::os::raw::c_uchar; 6usize], - pub h_proto: __be16, -} -#[test] -fn bindgen_test_layout_ethhdr() { - assert_eq!( - ::std::mem::size_of::(), - 14usize, - concat!("Size of: ", stringify!(ethhdr)) - ); - assert_eq!( - ::std::mem::align_of::(), - 1usize, - concat!("Alignment of ", stringify!(ethhdr)) - ); - assert_eq!( - unsafe { &(*(::std::ptr::null::())).h_dest as *const _ as usize }, - 0usize, - concat!( - "Offset of field: ", - stringify!(ethhdr), - "::", - stringify!(h_dest) - ) - ); - assert_eq!( - unsafe { &(*(::std::ptr::null::())).h_source as *const _ as usize }, - 6usize, - concat!( - "Offset of field: ", - stringify!(ethhdr), - "::", - stringify!(h_source) - ) - ); - assert_eq!( - unsafe { &(*(::std::ptr::null::())).h_proto as *const _ as usize }, - 12usize, - concat!( - "Offset of field: ", - stringify!(ethhdr), - "::", - stringify!(h_proto) - ) - ); -} -#[repr(C, packed)] -#[derive(Debug, Default, Copy, Clone, PartialEq)] -pub struct virtio_net_config { - pub mac: [__u8; 6usize], - pub status: __u16, - pub max_virtqueue_pairs: __u16, - pub mtu: __u16, -} -#[test] -fn bindgen_test_layout_virtio_net_config() { - assert_eq!( - ::std::mem::size_of::(), - 12usize, - concat!("Size of: ", stringify!(virtio_net_config)) - ); - assert_eq!( - ::std::mem::align_of::(), - 1usize, - concat!("Alignment of ", stringify!(virtio_net_config)) - ); - assert_eq!( - unsafe { &(*(::std::ptr::null::())).mac as *const _ as usize }, - 0usize, - concat!( - "Offset of field: ", - stringify!(virtio_net_config), - "::", - stringify!(mac) - ) - ); - assert_eq!( - unsafe { &(*(::std::ptr::null::())).status as *const _ as usize }, - 6usize, - concat!( - "Offset of field: ", - stringify!(virtio_net_config), - "::", - stringify!(status) - ) - ); - assert_eq!( - unsafe { - &(*(::std::ptr::null::())).max_virtqueue_pairs as *const _ as usize - }, - 8usize, - concat!( - "Offset of field: ", - stringify!(virtio_net_config), - "::", - stringify!(max_virtqueue_pairs) - ) - ); - assert_eq!( - unsafe { &(*(::std::ptr::null::())).mtu as *const _ as usize }, - 10usize, - concat!( - "Offset of field: ", - stringify!(virtio_net_config), - "::", - stringify!(mtu) - ) - ); -} -#[repr(C)] -#[derive(Debug, Default, Copy, Clone, PartialEq)] -pub struct virtio_net_hdr_v1 { - pub flags: __u8, - pub gso_type: __u8, - pub hdr_len: __virtio16, - pub gso_size: __virtio16, - pub csum_start: __virtio16, - pub csum_offset: __virtio16, - pub num_buffers: __virtio16, -} -#[test] -fn bindgen_test_layout_virtio_net_hdr_v1() { - assert_eq!( - ::std::mem::size_of::(), - 12usize, - concat!("Size of: ", stringify!(virtio_net_hdr_v1)) - ); - assert_eq!( - ::std::mem::align_of::(), - 2usize, - concat!("Alignment of ", stringify!(virtio_net_hdr_v1)) - ); - assert_eq!( - unsafe { &(*(::std::ptr::null::())).flags as *const _ as usize }, - 0usize, - concat!( - "Offset of field: ", - stringify!(virtio_net_hdr_v1), - "::", - stringify!(flags) - ) - ); - assert_eq!( - unsafe { &(*(::std::ptr::null::())).gso_type as *const _ as usize }, - 1usize, - concat!( - "Offset of field: ", - stringify!(virtio_net_hdr_v1), - "::", - stringify!(gso_type) - ) - ); - assert_eq!( - unsafe { &(*(::std::ptr::null::())).hdr_len as *const _ as usize }, - 2usize, - concat!( - "Offset of field: ", - stringify!(virtio_net_hdr_v1), - "::", - stringify!(hdr_len) - ) - ); - assert_eq!( - unsafe { &(*(::std::ptr::null::())).gso_size as *const _ as usize }, - 4usize, - concat!( - "Offset of field: ", - stringify!(virtio_net_hdr_v1), - "::", - stringify!(gso_size) - ) - ); - assert_eq!( - unsafe { &(*(::std::ptr::null::())).csum_start as *const _ as usize }, - 6usize, - concat!( - "Offset of field: ", - stringify!(virtio_net_hdr_v1), - "::", - stringify!(csum_start) - ) - ); - assert_eq!( - unsafe { &(*(::std::ptr::null::())).csum_offset as *const _ as usize }, - 8usize, - concat!( - "Offset of field: ", - stringify!(virtio_net_hdr_v1), - "::", - stringify!(csum_offset) - ) - ); - assert_eq!( - unsafe { &(*(::std::ptr::null::())).num_buffers as *const _ as usize }, - 10usize, - concat!( - "Offset of field: ", - stringify!(virtio_net_hdr_v1), - "::", - stringify!(num_buffers) - ) - ); -} -#[repr(C)] -#[derive(Debug, Default, Copy, Clone, PartialEq)] -pub struct virtio_net_hdr { - pub flags: __u8, - pub gso_type: __u8, - pub hdr_len: __virtio16, - pub gso_size: __virtio16, - pub csum_start: __virtio16, - pub csum_offset: __virtio16, -} -#[test] -fn bindgen_test_layout_virtio_net_hdr() { - assert_eq!( - ::std::mem::size_of::(), - 10usize, - concat!("Size of: ", stringify!(virtio_net_hdr)) - ); - assert_eq!( - ::std::mem::align_of::(), - 2usize, - concat!("Alignment of ", stringify!(virtio_net_hdr)) - ); - assert_eq!( - unsafe { &(*(::std::ptr::null::())).flags as *const _ as usize }, - 0usize, - concat!( - "Offset of field: ", - stringify!(virtio_net_hdr), - "::", - stringify!(flags) - ) - ); - assert_eq!( - unsafe { &(*(::std::ptr::null::())).gso_type as *const _ as usize }, - 1usize, - concat!( - "Offset of field: ", - stringify!(virtio_net_hdr), - "::", - stringify!(gso_type) - ) - ); - assert_eq!( - unsafe { &(*(::std::ptr::null::())).hdr_len as *const _ as usize }, - 2usize, - concat!( - "Offset of field: ", - stringify!(virtio_net_hdr), - "::", - stringify!(hdr_len) - ) - ); - assert_eq!( - unsafe { &(*(::std::ptr::null::())).gso_size as *const _ as usize }, - 4usize, - concat!( - "Offset of field: ", - stringify!(virtio_net_hdr), - "::", - stringify!(gso_size) - ) - ); - assert_eq!( - unsafe { &(*(::std::ptr::null::())).csum_start as *const _ as usize }, - 6usize, - concat!( - "Offset of field: ", - stringify!(virtio_net_hdr), - "::", - stringify!(csum_start) - ) - ); - assert_eq!( - unsafe { &(*(::std::ptr::null::())).csum_offset as *const _ as usize }, - 8usize, - concat!( - "Offset of field: ", - stringify!(virtio_net_hdr), - "::", - stringify!(csum_offset) - ) - ); -} -#[repr(C)] -#[derive(Debug, Default, Copy, Clone, PartialEq)] -pub struct virtio_net_hdr_mrg_rxbuf { - pub hdr: virtio_net_hdr, - pub num_buffers: __virtio16, -} -#[test] -fn bindgen_test_layout_virtio_net_hdr_mrg_rxbuf() { - assert_eq!( - ::std::mem::size_of::(), - 12usize, - concat!("Size of: ", stringify!(virtio_net_hdr_mrg_rxbuf)) - ); - assert_eq!( - ::std::mem::align_of::(), - 2usize, - concat!("Alignment of ", stringify!(virtio_net_hdr_mrg_rxbuf)) - ); - assert_eq!( - unsafe { &(*(::std::ptr::null::())).hdr as *const _ as usize }, - 0usize, - concat!( - "Offset of field: ", - stringify!(virtio_net_hdr_mrg_rxbuf), - "::", - stringify!(hdr) - ) - ); - assert_eq!( - unsafe { - &(*(::std::ptr::null::())).num_buffers as *const _ as usize - }, - 10usize, - concat!( - "Offset of field: ", - stringify!(virtio_net_hdr_mrg_rxbuf), - "::", - stringify!(num_buffers) - ) - ); -} -#[repr(C, packed)] -#[derive(Debug, Default, Copy, Clone, PartialEq)] -pub struct virtio_net_ctrl_hdr { - pub class: __u8, - pub cmd: __u8, -} -#[test] -fn bindgen_test_layout_virtio_net_ctrl_hdr() { - assert_eq!( - ::std::mem::size_of::(), - 2usize, - concat!("Size of: ", stringify!(virtio_net_ctrl_hdr)) - ); - assert_eq!( - ::std::mem::align_of::(), - 1usize, - concat!("Alignment of ", stringify!(virtio_net_ctrl_hdr)) - ); - assert_eq!( - unsafe { &(*(::std::ptr::null::())).class as *const _ as usize }, - 0usize, - concat!( - "Offset of field: ", - stringify!(virtio_net_ctrl_hdr), - "::", - stringify!(class) - ) - ); - assert_eq!( - unsafe { &(*(::std::ptr::null::())).cmd as *const _ as usize }, - 1usize, - concat!( - "Offset of field: ", - stringify!(virtio_net_ctrl_hdr), - "::", - stringify!(cmd) - ) - ); -} -pub type virtio_net_ctrl_ack = __u8; -#[repr(C, packed)] -#[derive(Default)] -pub struct virtio_net_ctrl_mac { - pub entries: __virtio32, - pub macs: __IncompleteArrayField<[__u8; 6usize]>, -} -#[test] -fn bindgen_test_layout_virtio_net_ctrl_mac() { - assert_eq!( - ::std::mem::size_of::(), - 4usize, - concat!("Size of: ", stringify!(virtio_net_ctrl_mac)) - ); - assert_eq!( - ::std::mem::align_of::(), - 1usize, - concat!("Alignment of ", stringify!(virtio_net_ctrl_mac)) - ); -} -#[repr(C)] -#[derive(Debug, Default, Copy, Clone, PartialEq)] -pub struct virtio_net_ctrl_mq { - pub virtqueue_pairs: __virtio16, -} -#[test] -fn bindgen_test_layout_virtio_net_ctrl_mq() { - assert_eq!( - ::std::mem::size_of::(), - 2usize, - concat!("Size of: ", stringify!(virtio_net_ctrl_mq)) - ); - assert_eq!( - ::std::mem::align_of::(), - 2usize, - concat!("Alignment of ", stringify!(virtio_net_ctrl_mq)) - ); - assert_eq!( - unsafe { - &(*(::std::ptr::null::())).virtqueue_pairs as *const _ as usize - }, - 0usize, - concat!( - "Offset of field: ", - stringify!(virtio_net_ctrl_mq), - "::", - stringify!(virtqueue_pairs) - ) - ); -} diff --git a/virtio-bindings/src/virtio_ring.rs b/virtio-bindings/src/virtio_ring.rs deleted file mode 100644 index 001cb03c8..000000000 --- a/virtio-bindings/src/virtio_ring.rs +++ /dev/null @@ -1,453 +0,0 @@ -// Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. -// SPDX-License-Identifier: Apache-2.0 - -/* automatically generated by rust-bindgen */ - -#[repr(C)] -#[derive(Default)] -pub struct __IncompleteArrayField(::std::marker::PhantomData, [T; 0]); -impl __IncompleteArrayField { - #[inline] - pub fn new() -> Self { - __IncompleteArrayField(::std::marker::PhantomData, []) - } - #[inline] - pub unsafe fn as_ptr(&self) -> *const T { - ::std::mem::transmute(self) - } - #[inline] - pub unsafe fn as_mut_ptr(&mut self) -> *mut T { - ::std::mem::transmute(self) - } - #[inline] - pub unsafe fn as_slice(&self, len: usize) -> &[T] { - ::std::slice::from_raw_parts(self.as_ptr(), len) - } - #[inline] - pub unsafe fn as_mut_slice(&mut self, len: usize) -> &mut [T] { - ::std::slice::from_raw_parts_mut(self.as_mut_ptr(), len) - } -} -impl ::std::fmt::Debug for __IncompleteArrayField { - fn fmt(&self, fmt: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { - fmt.write_str("__IncompleteArrayField") - } -} -impl ::std::clone::Clone for __IncompleteArrayField { - #[inline] - fn clone(&self) -> Self { - Self::new() - } -} -pub const _STDINT_H: u32 = 1; -pub const _FEATURES_H: u32 = 1; -pub const _DEFAULT_SOURCE: u32 = 1; -pub const __USE_ISOC11: u32 = 1; -pub const __USE_ISOC99: u32 = 1; -pub const __USE_ISOC95: u32 = 1; -pub const __USE_POSIX_IMPLICITLY: u32 = 1; -pub const _POSIX_SOURCE: u32 = 1; -pub const _POSIX_C_SOURCE: u32 = 200809; -pub const __USE_POSIX: u32 = 1; -pub const __USE_POSIX2: u32 = 1; -pub const __USE_POSIX199309: u32 = 1; -pub const __USE_POSIX199506: u32 = 1; -pub const __USE_XOPEN2K: u32 = 1; -pub const __USE_XOPEN2K8: u32 = 1; -pub const _ATFILE_SOURCE: u32 = 1; -pub const __USE_MISC: u32 = 1; -pub const __USE_ATFILE: u32 = 1; -pub const __USE_FORTIFY_LEVEL: u32 = 0; -pub const _STDC_PREDEF_H: u32 = 1; -pub const __STDC_IEC_559__: u32 = 1; -pub const __STDC_IEC_559_COMPLEX__: u32 = 1; -pub const __STDC_ISO_10646__: u32 = 201505; -pub const __STDC_NO_THREADS__: u32 = 1; -pub const __GNU_LIBRARY__: u32 = 6; -pub const __GLIBC__: u32 = 2; -pub const __GLIBC_MINOR__: u32 = 23; -pub const _SYS_CDEFS_H: u32 = 1; -pub const __WORDSIZE: u32 = 64; -pub const __WORDSIZE_TIME64_COMPAT32: u32 = 1; -pub const __SYSCALL_WORDSIZE: u32 = 64; -pub const _BITS_WCHAR_H: u32 = 1; -pub const INT8_MIN: i32 = -128; -pub const INT16_MIN: i32 = -32768; -pub const INT32_MIN: i32 = -2147483648; -pub const INT8_MAX: u32 = 127; -pub const INT16_MAX: u32 = 32767; -pub const INT32_MAX: u32 = 2147483647; -pub const UINT8_MAX: u32 = 255; -pub const UINT16_MAX: u32 = 65535; -pub const UINT32_MAX: u32 = 4294967295; -pub const INT_LEAST8_MIN: i32 = -128; -pub const INT_LEAST16_MIN: i32 = -32768; -pub const INT_LEAST32_MIN: i32 = -2147483648; -pub const INT_LEAST8_MAX: u32 = 127; -pub const INT_LEAST16_MAX: u32 = 32767; -pub const INT_LEAST32_MAX: u32 = 2147483647; -pub const UINT_LEAST8_MAX: u32 = 255; -pub const UINT_LEAST16_MAX: u32 = 65535; -pub const UINT_LEAST32_MAX: u32 = 4294967295; -pub const INT_FAST8_MIN: i32 = -128; -pub const INT_FAST16_MIN: i64 = -9223372036854775808; -pub const INT_FAST32_MIN: i64 = -9223372036854775808; -pub const INT_FAST8_MAX: u32 = 127; -pub const INT_FAST16_MAX: u64 = 9223372036854775807; -pub const INT_FAST32_MAX: u64 = 9223372036854775807; -pub const UINT_FAST8_MAX: u32 = 255; -pub const UINT_FAST16_MAX: i32 = -1; -pub const UINT_FAST32_MAX: i32 = -1; -pub const INTPTR_MIN: i64 = -9223372036854775808; -pub const INTPTR_MAX: u64 = 9223372036854775807; -pub const UINTPTR_MAX: i32 = -1; -pub const PTRDIFF_MIN: i64 = -9223372036854775808; -pub const PTRDIFF_MAX: u64 = 9223372036854775807; -pub const SIG_ATOMIC_MIN: i32 = -2147483648; -pub const SIG_ATOMIC_MAX: u32 = 2147483647; -pub const SIZE_MAX: i32 = -1; -pub const WINT_MIN: u32 = 0; -pub const WINT_MAX: u32 = 4294967295; -pub const __BITS_PER_LONG: u32 = 64; -pub const __FD_SETSIZE: u32 = 1024; -pub const VRING_DESC_F_NEXT: u32 = 1; -pub const VRING_DESC_F_WRITE: u32 = 2; -pub const VRING_DESC_F_INDIRECT: u32 = 4; -pub const VRING_USED_F_NO_NOTIFY: u32 = 1; -pub const VRING_AVAIL_F_NO_INTERRUPT: u32 = 1; -pub const VIRTIO_RING_F_INDIRECT_DESC: u32 = 28; -pub const VIRTIO_RING_F_EVENT_IDX: u32 = 29; -pub const VRING_AVAIL_ALIGN_SIZE: u32 = 2; -pub const VRING_USED_ALIGN_SIZE: u32 = 4; -pub const VRING_DESC_ALIGN_SIZE: u32 = 16; -pub type int_least8_t = ::std::os::raw::c_schar; -pub type int_least16_t = ::std::os::raw::c_short; -pub type int_least32_t = ::std::os::raw::c_int; -pub type int_least64_t = ::std::os::raw::c_long; -pub type uint_least8_t = ::std::os::raw::c_uchar; -pub type uint_least16_t = ::std::os::raw::c_ushort; -pub type uint_least32_t = ::std::os::raw::c_uint; -pub type uint_least64_t = ::std::os::raw::c_ulong; -pub type int_fast8_t = ::std::os::raw::c_schar; -pub type int_fast16_t = ::std::os::raw::c_long; -pub type int_fast32_t = ::std::os::raw::c_long; -pub type int_fast64_t = ::std::os::raw::c_long; -pub type uint_fast8_t = ::std::os::raw::c_uchar; -pub type uint_fast16_t = ::std::os::raw::c_ulong; -pub type uint_fast32_t = ::std::os::raw::c_ulong; -pub type uint_fast64_t = ::std::os::raw::c_ulong; -pub type intmax_t = ::std::os::raw::c_long; -pub type uintmax_t = ::std::os::raw::c_ulong; -pub type __s8 = ::std::os::raw::c_schar; -pub type __u8 = ::std::os::raw::c_uchar; -pub type __s16 = ::std::os::raw::c_short; -pub type __u16 = ::std::os::raw::c_ushort; -pub type __s32 = ::std::os::raw::c_int; -pub type __u32 = ::std::os::raw::c_uint; -pub type __s64 = ::std::os::raw::c_longlong; -pub type __u64 = ::std::os::raw::c_ulonglong; -#[repr(C)] -#[derive(Debug, Default, Copy, Clone, PartialEq)] -pub struct __kernel_fd_set { - pub fds_bits: [::std::os::raw::c_ulong; 16usize], -} -#[test] -fn bindgen_test_layout___kernel_fd_set() { - assert_eq!( - ::std::mem::size_of::<__kernel_fd_set>(), - 128usize, - concat!("Size of: ", stringify!(__kernel_fd_set)) - ); - assert_eq!( - ::std::mem::align_of::<__kernel_fd_set>(), - 8usize, - concat!("Alignment of ", stringify!(__kernel_fd_set)) - ); - assert_eq!( - unsafe { &(*(::std::ptr::null::<__kernel_fd_set>())).fds_bits as *const _ as usize }, - 0usize, - concat!( - "Offset of field: ", - stringify!(__kernel_fd_set), - "::", - stringify!(fds_bits) - ) - ); -} -pub type __kernel_sighandler_t = - ::std::option::Option; -pub type __kernel_key_t = ::std::os::raw::c_int; -pub type __kernel_mqd_t = ::std::os::raw::c_int; -pub type __kernel_old_uid_t = ::std::os::raw::c_ushort; -pub type __kernel_old_gid_t = ::std::os::raw::c_ushort; -pub type __kernel_old_dev_t = ::std::os::raw::c_ulong; -pub type __kernel_long_t = ::std::os::raw::c_long; -pub type __kernel_ulong_t = ::std::os::raw::c_ulong; -pub type __kernel_ino_t = __kernel_ulong_t; -pub type __kernel_mode_t = ::std::os::raw::c_uint; -pub type __kernel_pid_t = ::std::os::raw::c_int; -pub type __kernel_ipc_pid_t = ::std::os::raw::c_int; -pub type __kernel_uid_t = ::std::os::raw::c_uint; -pub type __kernel_gid_t = ::std::os::raw::c_uint; -pub type __kernel_suseconds_t = __kernel_long_t; -pub type __kernel_daddr_t = ::std::os::raw::c_int; -pub type __kernel_uid32_t = ::std::os::raw::c_uint; -pub type __kernel_gid32_t = ::std::os::raw::c_uint; -pub type __kernel_size_t = __kernel_ulong_t; -pub type __kernel_ssize_t = __kernel_long_t; -pub type __kernel_ptrdiff_t = __kernel_long_t; -#[repr(C)] -#[derive(Debug, Default, Copy, Clone, PartialEq)] -pub struct __kernel_fsid_t { - pub val: [::std::os::raw::c_int; 2usize], -} -#[test] -fn bindgen_test_layout___kernel_fsid_t() { - assert_eq!( - ::std::mem::size_of::<__kernel_fsid_t>(), - 8usize, - concat!("Size of: ", stringify!(__kernel_fsid_t)) - ); - assert_eq!( - ::std::mem::align_of::<__kernel_fsid_t>(), - 4usize, - concat!("Alignment of ", stringify!(__kernel_fsid_t)) - ); - assert_eq!( - unsafe { &(*(::std::ptr::null::<__kernel_fsid_t>())).val as *const _ as usize }, - 0usize, - concat!( - "Offset of field: ", - stringify!(__kernel_fsid_t), - "::", - stringify!(val) - ) - ); -} -pub type __kernel_off_t = __kernel_long_t; -pub type __kernel_loff_t = ::std::os::raw::c_longlong; -pub type __kernel_time_t = __kernel_long_t; -pub type __kernel_clock_t = __kernel_long_t; -pub type __kernel_timer_t = ::std::os::raw::c_int; -pub type __kernel_clockid_t = ::std::os::raw::c_int; -pub type __kernel_caddr_t = *mut ::std::os::raw::c_char; -pub type __kernel_uid16_t = ::std::os::raw::c_ushort; -pub type __kernel_gid16_t = ::std::os::raw::c_ushort; -pub type __le16 = __u16; -pub type __be16 = __u16; -pub type __le32 = __u32; -pub type __be32 = __u32; -pub type __le64 = __u64; -pub type __be64 = __u64; -pub type __sum16 = __u16; -pub type __wsum = __u32; -pub type __virtio16 = __u16; -pub type __virtio32 = __u32; -pub type __virtio64 = __u64; -#[repr(C)] -#[derive(Debug, Default, Copy, Clone, PartialEq)] -pub struct vring_desc { - pub addr: __virtio64, - pub len: __virtio32, - pub flags: __virtio16, - pub next: __virtio16, -} -#[test] -fn bindgen_test_layout_vring_desc() { - assert_eq!( - ::std::mem::size_of::(), - 16usize, - concat!("Size of: ", stringify!(vring_desc)) - ); - assert_eq!( - ::std::mem::align_of::(), - 8usize, - concat!("Alignment of ", stringify!(vring_desc)) - ); - assert_eq!( - unsafe { &(*(::std::ptr::null::())).addr as *const _ as usize }, - 0usize, - concat!( - "Offset of field: ", - stringify!(vring_desc), - "::", - stringify!(addr) - ) - ); - assert_eq!( - unsafe { &(*(::std::ptr::null::())).len as *const _ as usize }, - 8usize, - concat!( - "Offset of field: ", - stringify!(vring_desc), - "::", - stringify!(len) - ) - ); - assert_eq!( - unsafe { &(*(::std::ptr::null::())).flags as *const _ as usize }, - 12usize, - concat!( - "Offset of field: ", - stringify!(vring_desc), - "::", - stringify!(flags) - ) - ); - assert_eq!( - unsafe { &(*(::std::ptr::null::())).next as *const _ as usize }, - 14usize, - concat!( - "Offset of field: ", - stringify!(vring_desc), - "::", - stringify!(next) - ) - ); -} -#[repr(C)] -#[derive(Debug, Default)] -pub struct vring_avail { - pub flags: __virtio16, - pub idx: __virtio16, - pub ring: __IncompleteArrayField<__virtio16>, -} -#[test] -fn bindgen_test_layout_vring_avail() { - assert_eq!( - ::std::mem::size_of::(), - 4usize, - concat!("Size of: ", stringify!(vring_avail)) - ); - assert_eq!( - ::std::mem::align_of::(), - 2usize, - concat!("Alignment of ", stringify!(vring_avail)) - ); -} -#[repr(C)] -#[derive(Debug, Default, Copy, Clone, PartialEq)] -pub struct vring_used_elem { - pub id: __virtio32, - pub len: __virtio32, -} -#[test] -fn bindgen_test_layout_vring_used_elem() { - assert_eq!( - ::std::mem::size_of::(), - 8usize, - concat!("Size of: ", stringify!(vring_used_elem)) - ); - assert_eq!( - ::std::mem::align_of::(), - 4usize, - concat!("Alignment of ", stringify!(vring_used_elem)) - ); - assert_eq!( - unsafe { &(*(::std::ptr::null::())).id as *const _ as usize }, - 0usize, - concat!( - "Offset of field: ", - stringify!(vring_used_elem), - "::", - stringify!(id) - ) - ); - assert_eq!( - unsafe { &(*(::std::ptr::null::())).len as *const _ as usize }, - 4usize, - concat!( - "Offset of field: ", - stringify!(vring_used_elem), - "::", - stringify!(len) - ) - ); -} -#[repr(C)] -#[derive(Debug, Default)] -pub struct vring_used { - pub flags: __virtio16, - pub idx: __virtio16, - pub ring: __IncompleteArrayField, - pub __bindgen_align: [u32; 0usize], -} -#[test] -fn bindgen_test_layout_vring_used() { - assert_eq!( - ::std::mem::size_of::(), - 4usize, - concat!("Size of: ", stringify!(vring_used)) - ); - assert_eq!( - ::std::mem::align_of::(), - 4usize, - concat!("Alignment of ", stringify!(vring_used)) - ); -} -#[repr(C)] -#[derive(Debug, Copy, Clone, PartialEq)] -pub struct vring { - pub num: ::std::os::raw::c_uint, - pub desc: *mut vring_desc, - pub avail: *mut vring_avail, - pub used: *mut vring_used, -} -#[test] -fn bindgen_test_layout_vring() { - assert_eq!( - ::std::mem::size_of::(), - 32usize, - concat!("Size of: ", stringify!(vring)) - ); - assert_eq!( - ::std::mem::align_of::(), - 8usize, - concat!("Alignment of ", stringify!(vring)) - ); - assert_eq!( - unsafe { &(*(::std::ptr::null::())).num as *const _ as usize }, - 0usize, - concat!( - "Offset of field: ", - stringify!(vring), - "::", - stringify!(num) - ) - ); - assert_eq!( - unsafe { &(*(::std::ptr::null::())).desc as *const _ as usize }, - 8usize, - concat!( - "Offset of field: ", - stringify!(vring), - "::", - stringify!(desc) - ) - ); - assert_eq!( - unsafe { &(*(::std::ptr::null::())).avail as *const _ as usize }, - 16usize, - concat!( - "Offset of field: ", - stringify!(vring), - "::", - stringify!(avail) - ) - ); - assert_eq!( - unsafe { &(*(::std::ptr::null::())).used as *const _ as usize }, - 24usize, - concat!( - "Offset of field: ", - stringify!(vring), - "::", - stringify!(used) - ) - ); -} -impl Default for vring { - fn default() -> Self { - unsafe { ::std::mem::zeroed() } - } -} diff --git a/vm-virtio/Cargo.toml b/vm-virtio/Cargo.toml index 8156c7374..892520501 100644 --- a/vm-virtio/Cargo.toml +++ b/vm-virtio/Cargo.toml @@ -19,7 +19,7 @@ net_gen = { path = "../net_gen" } net_util = { path = "../net_util" } pci = { path = "../pci", optional = true } tempfile = "3.1.0" -virtio-bindings = { path = "../virtio-bindings" } +virtio-bindings = { git = "https://github.com/rust-vmm/virtio-bindings", version = "0.1", features = ["virtio-v5_0_0"]} vm-allocator = { path = "../vm-allocator" } vmm-sys-util = { git = "https://github.com/rust-vmm/vmm-sys-util" } diff --git a/vm-virtio/src/block.rs b/vm-virtio/src/block.rs index 3f9d959ad..80927078c 100755 --- a/vm-virtio/src/block.rs +++ b/vm-virtio/src/block.rs @@ -26,7 +26,7 @@ use super::{ VirtioDeviceType, VirtioInterruptType, }; use crate::VirtioInterrupt; -use virtio_bindings::virtio_blk::*; +use virtio_bindings::bindings::virtio_blk::*; use vm_memory::{Bytes, GuestAddress, GuestMemory, GuestMemoryError, GuestMemoryMmap}; use vmm_sys_util::eventfd::EventFd; diff --git a/vm-virtio/src/net.rs b/vm-virtio/src/net.rs index 630e21f19..fda4c8c5e 100644 --- a/vm-virtio/src/net.rs +++ b/vm-virtio/src/net.rs @@ -28,7 +28,7 @@ use super::{ }; use crate::VirtioInterrupt; use net_util::{MacAddr, Tap, TapError, MAC_ADDR_LEN}; -use virtio_bindings::virtio_net::*; +use virtio_bindings::bindings::virtio_net::*; use vm_memory::{Bytes, GuestAddress, GuestMemoryMmap}; use vmm_sys_util::eventfd::EventFd; diff --git a/vm-virtio/src/vhost_user/net.rs b/vm-virtio/src/vhost_user/net.rs index 21823349e..14a44c5b0 100644 --- a/vm-virtio/src/vhost_user/net.rs +++ b/vm-virtio/src/vhost_user/net.rs @@ -22,8 +22,8 @@ use super::{Error, Result}; use vhost_rs::vhost_user::message::VhostUserVirtioFeatures; use vhost_rs::vhost_user::{Master, VhostUserMaster, VhostUserMasterReqHandler}; use vhost_rs::VhostBackend; -use virtio_bindings::virtio_net; -use virtio_bindings::virtio_ring; +use virtio_bindings::bindings::virtio_net; +use virtio_bindings::bindings::virtio_ring; struct SlaveReqHandler {} impl VhostUserMasterReqHandler for SlaveReqHandler {}