Skip to content

Commit 36d69b5

Browse files
mkroeningmkroening
committed
feat: update zerocopy to 0.8 and endian-num to 0.2
Signed-off-by: Martin Kröning <martin.kroening@eonerc.rwth-aachen.de>
1 parent 0ad695f commit 36d69b5

File tree

8 files changed

+67
-29
lines changed

8 files changed

+67
-29
lines changed

‎Cargo.lock‎

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ rustdoc-args = ["--cfg", "docsrs"]
1717
allocator-api2 = { version = "0.2", default-features = false, features = ["alloc"], optional = true }
1818
bitfield-struct = "0.9"
1919
bitflags = "2"
20-
endian-num = { version = "0.1", features = ["bitflags", "linux-types"] }
20+
endian-num = { version = "0.2", features = ["bitflags", "linux-types"] }
2121
num_enum = { version = "0.7", default-features = false }
2222
pci_types = { version = "0.10", optional = true }
2323
volatile = "0.6"
2424
volatile-macro = "0.6"
25-
zerocopy = { version = "0.7", optional = true, default-features = false }
26-
zerocopy-derive = { version = "0.7", optional = true }
25+
zerocopy = { version = "0.8", optional = true, default-features = false }
26+
zerocopy-derive = { version = "0.8", optional = true }
2727

2828
[features]
2929
alloc = ["dep:allocator-api2"]

‎src/bitflags.rs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@ macro_rules! _bitflags_base {
88
#[cfg_attr(
99
feature = "zerocopy",
1010
derive(
11-
zerocopy_derive::FromZeroes,
11+
zerocopy_derive::KnownLayout,
12+
zerocopy_derive::Immutable,
1213
zerocopy_derive::FromBytes,
13-
zerocopy_derive::AsBytes
14+
zerocopy_derive::IntoBytes,
1415
)
1516
)]
1617
#[derive(Default, Clone, Copy, PartialEq, Eq, Hash)]

‎src/fs.rs‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@ use super::le32;
1212
#[doc(alias = "virtio_fs_config")]
1313
#[cfg_attr(
1414
feature = "zerocopy",
15-
derive(zerocopy_derive::FromZeroes, zerocopy_derive::FromBytes)
15+
derive(
16+
zerocopy_derive::KnownLayout,
17+
zerocopy_derive::Immutable,
18+
zerocopy_derive::FromBytes,
19+
)
1620
)]
1721
#[derive(VolatileFieldAccess)]
1822
#[repr(C)]

‎src/lib.rs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,10 @@
3434
//! - `nightly` enables nightly-only functionality.
3535
//! - `pci` enables the [`pci`] module for Virtio Over PCI via the [`pci_types`] crate.
3636
//! - `zerocopy` derives the following traits for most structs:
37-
//! - [`zerocopy::FromZeroes`]
37+
//! - [`zerocopy::KnownLayout`]
38+
//! - [`zerocopy::Immutable`]
3839
//! - [`zerocopy::FromBytes`]
39-
//! - [`zerocopy::AsBytes`]
40+
//! - [`zerocopy::IntoBytes`]
4041
//!
4142
//! # Implementation Status
4243
//!

‎src/net.rs‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,11 @@ endian_bitflags! {
2525
#[doc(alias = "virtio_net_config")]
2626
#[cfg_attr(
2727
feature = "zerocopy",
28-
derive(zerocopy_derive::FromZeroes, zerocopy_derive::FromBytes)
28+
derive(
29+
zerocopy_derive::KnownLayout,
30+
zerocopy_derive::Immutable,
31+
zerocopy_derive::FromBytes,
32+
)
2933
)]
3034
#[derive(VolatileFieldAccess)]
3135
#[repr(C)]
@@ -102,9 +106,10 @@ virtio_bitflags! {
102106
#[cfg_attr(
103107
feature = "zerocopy",
104108
derive(
105-
zerocopy_derive::FromZeroes,
109+
zerocopy_derive::KnownLayout,
110+
zerocopy_derive::Immutable,
106111
zerocopy_derive::FromBytes,
107-
zerocopy_derive::AsBytes
112+
zerocopy_derive::IntoBytes,
108113
)
109114
)]
110115
#[derive(Default, Clone, Copy, Debug)]
@@ -126,9 +131,10 @@ pub struct Hdr {
126131
#[cfg_attr(
127132
feature = "zerocopy",
128133
derive(
129-
zerocopy_derive::FromZeroes,
134+
zerocopy_derive::KnownLayout,
135+
zerocopy_derive::Immutable,
130136
zerocopy_derive::FromBytes,
131-
zerocopy_derive::AsBytes
137+
zerocopy_derive::IntoBytes,
132138
)
133139
)]
134140
#[derive(Default, Clone, Copy, Debug)]

‎src/pci.rs‎

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,11 @@ use crate::{le16, le32, le64, DeviceConfigSpace, DeviceStatus, Le};
1919
#[doc(alias = "virtio_pci_cap")]
2020
#[cfg_attr(
2121
feature = "zerocopy",
22-
derive(zerocopy_derive::FromZeroes, zerocopy_derive::FromBytes)
22+
derive(
23+
zerocopy_derive::KnownLayout,
24+
zerocopy_derive::Immutable,
25+
zerocopy_derive::FromBytes,
26+
)
2327
)]
2428
#[derive(Clone, Copy, Debug)]
2529
#[repr(C)]
@@ -142,7 +146,11 @@ impl Cap {
142146
#[doc(alias = "virtio_pci_cap64")]
143147
#[cfg_attr(
144148
feature = "zerocopy",
145-
derive(zerocopy_derive::FromZeroes, zerocopy_derive::FromBytes)
149+
derive(
150+
zerocopy_derive::KnownLayout,
151+
zerocopy_derive::Immutable,
152+
zerocopy_derive::FromBytes,
153+
)
146154
)]
147155
#[derive(Clone, Copy, Debug)]
148156
#[repr(C)]
@@ -156,7 +164,11 @@ pub struct Cap64 {
156164
#[doc(alias = "virtio_pci_notify_cap")]
157165
#[cfg_attr(
158166
feature = "zerocopy",
159-
derive(zerocopy_derive::FromZeroes, zerocopy_derive::FromBytes)
167+
derive(
168+
zerocopy_derive::KnownLayout,
169+
zerocopy_derive::Immutable,
170+
zerocopy_derive::FromBytes,
171+
)
160172
)]
161173
#[derive(Clone, Copy, Debug)]
162174
#[repr(C)]
@@ -171,7 +183,11 @@ pub struct NotifyCap {
171183
#[doc(alias = "virtio_pci_cfg_cap")]
172184
#[cfg_attr(
173185
feature = "zerocopy",
174-
derive(zerocopy_derive::FromZeroes, zerocopy_derive::FromBytes)
186+
derive(
187+
zerocopy_derive::KnownLayout,
188+
zerocopy_derive::Immutable,
189+
zerocopy_derive::FromBytes,
190+
)
175191
)]
176192
#[derive(Clone, Copy, Debug)]
177193
#[repr(C)]
@@ -302,7 +318,11 @@ pub enum CapCfgType {
302318
#[doc(alias = "virtio_pci_common_cfg")]
303319
#[cfg_attr(
304320
feature = "zerocopy",
305-
derive(zerocopy_derive::FromZeroes, zerocopy_derive::FromBytes)
321+
derive(
322+
zerocopy_derive::KnownLayout,
323+
zerocopy_derive::Immutable,
324+
zerocopy_derive::FromBytes,
325+
)
306326
)]
307327
#[derive(VolatileFieldAccess)]
308328
#[repr(C)]

‎src/vsock.rs‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,11 @@ use crate::le64;
1313
#[doc(alias = "virtio_vsock_config")]
1414
#[cfg_attr(
1515
feature = "zerocopy",
16-
derive(zerocopy_derive::FromZeroes, zerocopy_derive::FromBytes)
16+
derive(
17+
zerocopy_derive::KnownLayout,
18+
zerocopy_derive::Immutable,
19+
zerocopy_derive::FromBytes,
20+
)
1721
)]
1822
#[derive(VolatileFieldAccess)]
1923
#[repr(C)]
@@ -26,9 +30,10 @@ pub struct Config {
2630
#[cfg_attr(
2731
feature = "zerocopy",
2832
derive(
29-
zerocopy_derive::FromZeroes,
33+
zerocopy_derive::KnownLayout,
34+
zerocopy_derive::Immutable,
3035
zerocopy_derive::FromBytes,
31-
zerocopy_derive::AsBytes
36+
zerocopy_derive::IntoBytes,
3237
)
3338
)]
3439
#[derive(Default, Clone, Copy, Debug)]
@@ -132,9 +137,10 @@ pub enum EventId {
132137
#[cfg_attr(
133138
feature = "zerocopy",
134139
derive(
135-
zerocopy_derive::FromZeroes,
140+
zerocopy_derive::KnownLayout,
141+
zerocopy_derive::Immutable,
136142
zerocopy_derive::FromBytes,
137-
zerocopy_derive::AsBytes
143+
zerocopy_derive::IntoBytes,
138144
)
139145
)]
140146
#[derive(Default, Clone, Copy, Debug)]

0 commit comments

Comments
 (0)