Fix macOS compilation due to wrong imports

Signed-off-by: Matej Hrica <[email protected]>
containers · Feb 6, 2024 · c16ffcf · c16ffcf
1 parent abb4f19
commit c16ffcf
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/src/devices/src/virtio/console/console_control.rs b/src/devices/src/virtio/console/console_control.rs
@@ -2,8 +2,8 @@ use std::collections::VecDeque;
 use std::ops::Deref;
 use std::sync::{Arc, Mutex};
 
-use libc::EFD_NONBLOCK;
 use utils::eventfd::EventFd;
+use utils::eventfd::EFD_NONBLOCK;
 use vm_memory::{ByteValued, GuestMemoryMmap};
 
 use crate::virtio::console::defs::control_event::{

diff --git a/src/devices/src/virtio/console/port_io.rs b/src/devices/src/virtio/console/port_io.rs
@@ -1,14 +1,13 @@
 use std::io::{self, ErrorKind};
 use std::os::fd::{AsRawFd, FromRawFd, OwnedFd, RawFd};
 
-use libc::{
-    fcntl, EFD_NONBLOCK, F_GETFL, F_SETFL, O_NONBLOCK, STDERR_FILENO, STDIN_FILENO, STDOUT_FILENO,
-};
+use libc::{fcntl, F_GETFL, F_SETFL, O_NONBLOCK, STDERR_FILENO, STDIN_FILENO, STDOUT_FILENO};
 use log::Level;
 use nix::errno::Errno;
 use nix::poll::{poll, PollFd, PollFlags};
 use nix::unistd::dup;
 use utils::eventfd::EventFd;
+use utils::eventfd::EFD_NONBLOCK;
 use vm_memory::bitmap::Bitmap;
 use vm_memory::{VolatileMemoryError, VolatileSlice, WriteVolatile};
 

diff --git a/src/vmm/src/builder.rs b/src/vmm/src/builder.rs
@@ -29,6 +29,7 @@ use kbs_types::Tee;
 use crate::device_manager;
 #[cfg(feature = "tee")]
 use crate::resources::TeeConfig;
+#[cfg(target_os = "linux")]
 use crate::signal_handler::register_sigint_handler;
 #[cfg(target_os = "linux")]
 use crate::signal_handler::register_sigwinch_handler;
@@ -1057,12 +1058,15 @@ fn attach_console_devices(
     let console_input = if stdin_is_terminal {
         Some(port_io::stdin().unwrap())
     } else {
-        let sigint_input = port_io::PortInputSigInt::new();
-        let sigint_input_fd = sigint_input.sigint_evt().as_raw_fd();
-
-        register_sigint_handler(sigint_input_fd).map_err(RegisterFsSigwinch)?;
-
-        Some(Box::new(sigint_input) as _)
+        #[cfg(target_os = "linux")]
+        {
+            let sigint_input = port_io::PortInputSigInt::new();
+            let sigint_input_fd = sigint_input.sigint_evt().as_raw_fd();
+            register_sigint_handler(sigint_input_fd).map_err(RegisterFsSigwinch)?;
+            Some(Box::new(sigint_input) as _)
+        }
+        #[cfg(not(target_os = "linux"))]
+        None
     };
 
     let console_output = if stdout_is_terminal {