Skip to content

Commit a354e87

Browse files
roypatmattschlebusch
authored andcommitted
Update vmm-sys-util to 0.10.0
Due to unlucky dependency management coinciding with a breaking change, cargo update caused an unbuildable workspace, and due to external factors, #3248 does not fix this. Signed-off-by: Patrick Roy <[email protected]>
1 parent 278ed3d commit a354e87

File tree

5 files changed

+14
-9
lines changed

5 files changed

+14
-9
lines changed

Cargo.lock

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

src/devices/src/virtio/net/tap.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ use std::os::unix::io::{AsRawFd, FromRawFd, RawFd};
1212

1313
use net_gen::ifreq;
1414
use utils::ioctl::{ioctl_with_mut_ref, ioctl_with_ref, ioctl_with_val};
15-
use utils::{ioctl_expr, ioctl_ioc_nr, ioctl_iow_nr};
15+
use utils::{ioctl_ioc_nr, ioctl_iow_nr};
1616

1717
// As defined in the Linux UAPI:
1818
// https://elixir.bootlin.com/linux/v4.17/source/include/uapi/linux/if.h#L33

src/utils/src/lib.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@
88
// dependency easier (i.e. update only in one place `vmm_sys_util` version).
99
// More specifically, we are re-exporting modules from `vmm_sys_util` as part
1010
// of the `utils` crate.
11+
pub use vmm_sys_util::ioctl::ioctl_expr;
1112
pub use vmm_sys_util::{
12-
epoll, errno, eventfd, fam, generate_fam_struct_impl, ioctl, ioctl_expr, ioctl_ioc_nr,
13-
ioctl_iow_nr, rand, seek_hole, sock_ctrl_msg, syscall, tempdir, tempfile, terminal,
13+
epoll, errno, eventfd, fam, generate_fam_struct_impl, ioctl, ioctl_ioc_nr, ioctl_iow_nr, rand,
14+
seek_hole, sock_ctrl_msg, syscall, tempdir, tempfile, terminal,
1415
};
1516

1617
pub mod arg_parser;

tests/host_tools/uffd/Cargo.lock

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

tests/integration_tests/security/demo_seccomp/Cargo.lock

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

0 commit comments

Comments
 (0)