From 0aed2407b4bead8f86fd3f7744fe7bbb2f673229 Mon Sep 17 00:00:00 2001
From: Jonathan Klimt <jonathan.klimt@eonerc.rwth-aachen.de>
Date: Fri, 24 Jan 2025 19:14:39 +0100
Subject: [PATCH] Made multiple uneccessary pub items private

---
 src/arch/x86_64/mod.rs      | 14 ++++++--------
 src/lib.rs                  | 10 +++++-----
 src/linux/gdb/mod.rs        |  4 ++--
 src/linux/mod.rs            |  4 ++--
 src/linux/x86_64/kvm_cpu.rs |  4 ++--
 src/macos/mod.rs            |  2 +-
 src/virtio.rs               |  1 -
 src/vm.rs                   |  2 +-
 8 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/src/arch/x86_64/mod.rs b/src/arch/x86_64/mod.rs
index 59b5072b..b8d69896 100644
--- a/src/arch/x86_64/mod.rs
+++ b/src/arch/x86_64/mod.rs
@@ -1,13 +1,14 @@
-pub mod paging;
-pub mod registers;
+mod paging;
+pub(crate) mod registers;
 
+use paging::initialize_pagetables;
 use uhyve_interface::{GuestPhysAddr, GuestVirtAddr};
 use x86_64::structures::paging::{
 	page_table::{FrameError, PageTableEntry},
 	PageTable, PageTableIndex,
 };
 
-use crate::{arch::paging::initialize_pagetables, mem::MmapMemory, paging::PagetableError};
+use crate::{mem::MmapMemory, paging::PagetableError};
 
 pub const RAM_START: GuestPhysAddr = GuestPhysAddr::new(0x00);
 
@@ -62,10 +63,7 @@ mod tests {
 	use x86_64::structures::paging::PageTableFlags;
 
 	use super::*;
-	use crate::{
-		arch::paging::MIN_PHYSMEM_SIZE,
-		consts::{BOOT_PDE, BOOT_PDPTE, BOOT_PML4},
-	};
+	use crate::consts::{BOOT_PDE, BOOT_PDPTE, BOOT_PML4};
 
 	#[test]
 	fn test_virt_to_phys() {
@@ -76,7 +74,7 @@ mod tests {
 
 		let mem = MmapMemory::new(
 			0,
-			align_up!(MIN_PHYSMEM_SIZE * 2, 0x20_0000),
+			align_up!(paging::MIN_PHYSMEM_SIZE * 2, 0x20_0000),
 			GuestPhysAddr::zero(),
 			true,
 			true,
diff --git a/src/lib.rs b/src/lib.rs
index 757cc6ba..a4891c6b 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -17,21 +17,21 @@ mod fdt;
 #[cfg(target_os = "linux")]
 pub mod linux;
 #[cfg(target_os = "linux")]
-pub use linux as os;
+use linux as os;
 #[cfg(target_os = "macos")]
 pub mod macos;
 #[cfg(target_os = "macos")]
-pub use macos as os;
+use macos as os;
 mod hypercall;
 mod isolation;
 pub mod mem;
-pub mod paging;
+pub(crate) mod paging;
 pub mod params;
 mod serial;
 pub mod stats;
 mod vcpu;
-pub mod virtio;
-pub mod virtqueue;
+mod virtio;
+mod virtqueue;
 pub mod vm;
 
 pub use arch::*;
diff --git a/src/linux/gdb/mod.rs b/src/linux/gdb/mod.rs
index b653ec95..cc1d174c 100644
--- a/src/linux/gdb/mod.rs
+++ b/src/linux/gdb/mod.rs
@@ -30,7 +30,7 @@ use crate::{
 	HypervisorError, HypervisorResult,
 };
 
-pub struct GdbUhyve {
+pub(crate) struct GdbUhyve {
 	pub(crate) vm: UhyveVm<KvmVm>,
 	hw_breakpoints: HwBreakpoints,
 	sw_breakpoints: SwBreakpoints,
@@ -192,7 +192,7 @@ impl target::ext::base::singlethread::SingleThreadSingleStep for GdbUhyve {
 	}
 }
 
-pub enum UhyveGdbEventLoop {}
+pub(crate) enum UhyveGdbEventLoop {}
 
 impl run_blocking::BlockingEventLoop for UhyveGdbEventLoop {
 	type Target = GdbUhyve;
diff --git a/src/linux/mod.rs b/src/linux/mod.rs
index 73be5708..31a0ae7e 100755
--- a/src/linux/mod.rs
+++ b/src/linux/mod.rs
@@ -1,9 +1,9 @@
 #[cfg(target_arch = "x86_64")]
 pub mod x86_64;
 
-pub mod gdb;
+pub(crate) mod gdb;
 
-pub type DebugExitInfo = kvm_bindings::kvm_debug_exit_arch;
+pub(crate) type DebugExitInfo = kvm_bindings::kvm_debug_exit_arch;
 
 use std::{
 	io,
diff --git a/src/linux/x86_64/kvm_cpu.rs b/src/linux/x86_64/kvm_cpu.rs
index 84f5bd1f..a4ec367e 100644
--- a/src/linux/x86_64/kvm_cpu.rs
+++ b/src/linux/x86_64/kvm_cpu.rs
@@ -343,11 +343,11 @@ impl KvmCpu {
 		println!("{name}       {seg:?}");
 	}
 
-	pub fn get_vcpu(&self) -> &VcpuFd {
+	pub(crate) fn get_vcpu(&self) -> &VcpuFd {
 		&self.vcpu
 	}
 
-	pub fn get_vcpu_mut(&mut self) -> &mut VcpuFd {
+	pub(crate) fn get_vcpu_mut(&mut self) -> &mut VcpuFd {
 		&mut self.vcpu
 	}
 
diff --git a/src/macos/mod.rs b/src/macos/mod.rs
index c7b3d8d2..812e19b9 100644
--- a/src/macos/mod.rs
+++ b/src/macos/mod.rs
@@ -42,7 +42,7 @@ impl KickSignal {
 	}
 }
 
-pub type DebugExitInfo = ();
+type DebugExitInfo = ();
 
 impl UhyveVm<XhyveVm> {
 	/// Runs the VM.
diff --git a/src/virtio.rs b/src/virtio.rs
index 7614d4f5..0013c0bc 100644
--- a/src/virtio.rs
+++ b/src/virtio.rs
@@ -81,7 +81,6 @@ macro_rules! write_u16 {
 	};
 }
 
-#[macro_export]
 macro_rules! read_u32 {
 	($registers:expr, $address:expr) => {
 		($registers[$address] as u32)
diff --git a/src/vm.rs b/src/vm.rs
index c56b298a..6bf81003 100644
--- a/src/vm.rs
+++ b/src/vm.rs
@@ -46,7 +46,7 @@ pub enum LoadKernelError {
 	InsufficientMemory,
 }
 
-pub type LoadKernelResult<T> = Result<T, LoadKernelError>;
+type LoadKernelResult<T> = Result<T, LoadKernelError>;
 
 #[cfg(target_os = "linux")]
 pub type DefaultBackend = crate::linux::x86_64::kvm_cpu::KvmVm;