diff --git a/tests/integration.rs b/tests/integration.rs index 1c2720158..672b6ac61 100644 --- a/tests/integration.rs +++ b/tests/integration.rs @@ -3823,7 +3823,7 @@ mod common_parallel { let focal = UbuntuDiskConfig::new(FOCAL_IMAGE_NAME.to_string()); let guest = Guest::new(Box::new(focal)); - let serial_path = guest.tmp_dir.as_path().join("/tmp/serial-output"); + let serial_path = guest.tmp_dir.as_path().join("serial-output"); #[cfg(target_arch = "x86_64")] let console_str: &str = "console=ttyS0"; #[cfg(target_arch = "aarch64")] @@ -4022,7 +4022,7 @@ mod common_parallel { let focal = UbuntuDiskConfig::new(FOCAL_IMAGE_NAME.to_string()); let guest = Guest::new(Box::new(focal)); - let console_path = guest.tmp_dir.as_path().join("/tmp/console-output"); + let console_path = guest.tmp_dir.as_path().join("console-output"); let mut child = GuestCommand::new(&guest) .args(["--cpus", "boot=1"]) .args(["--memory", "size=512M"]) diff --git a/virtio-devices/src/vhost_user/vu_common_ctrl.rs b/virtio-devices/src/vhost_user/vu_common_ctrl.rs index 7bbf936ce..ac4be26bd 100644 --- a/virtio-devices/src/vhost_user/vu_common_ctrl.rs +++ b/virtio-devices/src/vhost_user/vu_common_ctrl.rs @@ -7,7 +7,7 @@ use crate::{ get_host_address_range, GuestMemoryMmap, GuestRegionMmap, MmapRegion, VirtioInterrupt, VirtioInterruptType, }; -use std::convert::TryInto; + use std::ffi; use std::fs::File; use std::os::unix::io::{AsRawFd, FromRawFd, RawFd}; @@ -201,7 +201,7 @@ impl VhostUserHandle { let mut vrings_info = Vec::new(); for (queue_index, queue, queue_evt) in queues.iter() { - let actual_size: usize = queue.size().try_into().unwrap(); + let actual_size: usize = queue.size().into(); let config_data = VringConfigData { queue_max_size: queue.max_size(),