Skip to content

Commit d5c905e

Browse files
jinankjainrussell-islam
authored andcommitted
vfio: Upgrade vmm-sys-utils to v0.14.0
Requires a minor change in the error handling side of KVM to adapt to the new API. Signed-off-by: Jinank Jain <[email protected]>
1 parent 3d158a1 commit d5c905e

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

vfio-bindings/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ vfio-v5_0_0 = []
1717
fam-wrappers = ["vmm-sys-util"]
1818

1919
[dependencies]
20-
vmm-sys-util = { version = "0.12.1", optional = true }
20+
vmm-sys-util = { version = "0.14.0", optional = true }
2121

2222
[dev-dependencies]
2323
byteorder = "1.2.1"

vfio-ioctls/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ kvm-ioctls = { version = "0.19.0", optional = true }
2929
thiserror = "1.0"
3030
vfio-bindings = { version = "0.4.0", path = "../vfio-bindings" }
3131
vm-memory = { version = "0.16.0", features = ["backend-mmap"] }
32-
vmm-sys-util = "0.12.1"
32+
vmm-sys-util = "0.14.0"
3333
mshv-bindings = { version = "0.5.0", features = [
3434
"with-serde",
3535
"fam-wrappers",

vfio-ioctls/src/vfio_device.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ use mshv_bindings::{
3737
use mshv_ioctls::DeviceFd as MshvDeviceFd;
3838
#[cfg(all(any(feature = "kvm", feature = "mshv"), not(test)))]
3939
use std::os::unix::io::FromRawFd;
40-
#[cfg(all(feature = "mshv", not(test)))]
40+
#[cfg(all(any(feature = "kvm", feature = "mshv"), not(test)))]
4141
use vmm_sys_util::errno::Error;
4242

4343
#[derive(Debug)]
@@ -365,7 +365,7 @@ impl VfioContainer {
365365
addr: group_fd_ptr as u64,
366366
};
367367
fd.set_device_attr(&dev_attr)
368-
.map_err(VfioError::SetDeviceAttr)
368+
.map_err(|e| VfioError::SetDeviceAttr(Error::new(e.errno())))
369369
}
370370
#[cfg(feature = "mshv")]
371371
DeviceFdInner::Mshv(fd) => {

vfio-user/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ serde_json = "1.0.93"
2020
thiserror = "2.0.12"
2121
vfio-bindings = { version = "0.4.0", path = "../vfio-bindings", features = ["fam-wrappers"] }
2222
vm-memory = { version = "0.16.0", features = ["backend-mmap", "backend-atomic"] }
23-
vmm-sys-util = "0.13.0"
23+
vmm-sys-util = "0.14.0"
2424

2525
[dev-dependencies]
2626
argh = "0.1.9"

0 commit comments

Comments
 (0)