vmm: removed unnecessary pubs

The public interface of the VMM should contain just the following
structures, enums and types along with their implementation:
* VmmAction & VmmActionError
* the oneshot channels: OutcomeSender & OutcomeReceiver
* the data sent on the channels: VmmRequestOutcome
and the function start_vmm_thread, which is called from the main
crate.
Removed all the other pubs.

Moved test code to mod tests and added the test directive where
it was missing.

Signed-off-by: Andreea Florescu <[email protected]>

Author: andreeaflorescu

vmm/src/default_syscalls.rs

@@ -607,6 +607,7 @@ pub fn default_context() -> Result<SeccompFilterContext, Error> {
     )?)
 }
 
+#[cfg(test)]
 mod tests {
     extern crate libc;
     extern crate seccomp;

vmm/src/lib.rs

@@ -76,7 +76,7 @@ static START_INSTANCE_REQUEST_TS: AtomicUsize = ATOMIC_USIZE_INIT;
 /// input, but can result from bad configuration of the host (for example if Firecracker doesn't
 /// have permissions to open the KVM fd).
 #[derive(Debug)]
-pub enum Error {
+enum Error {
     /// Cannot receive message from the API.
     ApiChannel,
     /// Legacy devices work with Event file descriptors and the creation can fail because
@@ -306,7 +306,7 @@ impl EpollContext {
         })
     }
 
-    pub fn enable_stdin_event(&mut self) -> Result<()> {
+    fn enable_stdin_event(&mut self) -> Result<()> {
         if let Err(e) = epoll::ctl(
             self.epoll_raw_fd,
             epoll::EPOLL_CTL_ADD,
@@ -433,13 +433,13 @@ impl Drop for EpollContext {
     }
 }
 
-pub struct KernelConfig {
+struct KernelConfig {
     cmdline: kernel_cmdline::Cmdline,
     kernel_file: File,
     cmdline_addr: GuestAddress,
 }
 
-pub struct Vmm {
+struct Vmm {
     _kvm: KvmContext,
 
     vm_config: VmConfig,
@@ -1512,8 +1512,9 @@ impl Vmm {
     }
 }
 
-// Implementation for the "==" operator.
 // Can't derive PartialEq directly because the sender members can't be compared.
+// This implementation is only used in tests, but cannot be moved to mod tests,
+// because it is used in tests outside of the vmm crate (api_server).
 impl PartialEq for VmmAction {
     fn eq(&self, other: &VmmAction) -> bool {
         match (self, other) {

vmm/src/vstate.rs

@@ -141,14 +141,6 @@ impl Vcpu {
         })
     }
 
-    /// Returns a clone of the CPUID entries of this vCPU
-    /// For now this function is only used for testing; the cfg(test) should be removed when
-    /// this function will be used for configuring the cpu features
-    #[cfg(test)]
-    pub fn get_cpuid(&self) -> CpuId {
-        return self.cpuid.clone();
-    }
-
     /// /// Configures the vcpu and should be called once per vcpu from the vcpu's thread.
     ///
     /// # Arguments
@@ -206,6 +198,16 @@ impl Vcpu {
 
 #[cfg(test)]
 mod tests {
+
+    impl Vcpu {
+        /// Returns a clone of the CPUID entries of this vCPU
+        /// For now this function is only used for testing; the cfg(test) should be removed when
+        /// this function will be used for configuring the cpu features
+        pub fn get_cpuid(&self) -> CpuId {
+            return self.cpuid.clone();
+        }
+    }
+
     use super::*;
     use data_model::vm::CpuFeaturesTemplate;