Removed thp and ksm options, since they are not usable with vmm-mem anymore

Author: jounathaen

src/bin/uhyve.rs

@@ -189,23 +189,6 @@ pub struct MemoryArgs {
 	#[clap(long, action = clap::ArgAction::SetTrue)]
 	no_aslr: Option<bool>,
 
-	/// Transparent Hugepages
-	///
-	/// Advise the kernel to enable Transparent Hugepages [THP] on the virtual RAM.
-	///
-	/// [THP]: https://www.kernel.org/doc/html/latest/admin-guide/mm/transhuge.html
-	#[clap(long, action = clap::ArgAction::SetTrue)]
-	#[cfg(target_os = "linux")]
-	thp: Option<bool>,
-
-	/// Kernel Samepage Merging
-	///
-	/// Advise the kernel to enable Kernel Samepage Merging [KSM] on the virtual RAM.
-	///
-	/// [KSM]: https://www.kernel.org/doc/html/latest/admin-guide/mm/ksm.html
-	#[clap(long, action = clap::ArgAction::SetTrue)]
-	#[cfg(target_os = "linux")]
-	ksm: Option<bool>,
 }
 
 /// Arguments for the CPU resources allocated to the guest.
@@ -425,10 +408,6 @@ impl From<Args> for Params {
 				MemoryArgs {
 					memory_size,
 					no_aslr,
-					#[cfg(target_os = "linux")]
-					thp,
-					#[cfg(target_os = "linux")]
-					ksm,
 				},
 			cpu:
 				CpuArgs {
@@ -447,10 +426,6 @@ impl From<Args> for Params {
 		} = args;
 		Self {
 			memory_size: memory_size.unwrap_or_default(),
-			#[cfg(target_os = "linux")]
-			thp: thp.unwrap_or_default(),
-			#[cfg(target_os = "linux")]
-			ksm: ksm.unwrap_or_default(),
 			aslr: !no_aslr.unwrap_or_default(),
 			cpu_count: cpu_count.unwrap_or_default(),
 			#[cfg(target_os = "linux")]
@@ -674,10 +649,6 @@ mod tests {
 			memory: MemoryArgs {
 				memory_size: None,
 				no_aslr: None,
-				#[cfg(target_os = "linux")]
-				thp: None,
-				#[cfg(target_os = "linux")]
-				ksm: None,
 			},
 			cpu: CpuArgs {
 				cpu_count: None,
@@ -739,10 +710,6 @@ mod tests {
 			memory: MemoryArgs {
 				memory_size: Some(GuestMemorySize::from_str("16MiB").unwrap()),
 				no_aslr: Some(true),
-				#[cfg(target_os = "linux")]
-				thp: Some(true),
-				#[cfg(target_os = "linux")]
-				ksm: Some(true),
 			},
 			cpu: CpuArgs {
 				cpu_count: Some(CpuCount::from_str("4").unwrap()),

src/params.rs

@@ -19,13 +19,6 @@ pub struct Params {
 	/// Guest RAM size
 	pub memory_size: GuestMemorySize,
 
-	/// Advise Transparent Hugepages
-	#[cfg(target_os = "linux")]
-	pub thp: bool,
-
-	/// Advise Kernel Samepage Merging
-	#[cfg(target_os = "linux")]
-	pub ksm: bool,
 
 	/// Number of guest CPUs
 	pub cpu_count: CpuCount,
@@ -80,10 +73,6 @@ impl Default for Params {
 		Self {
 			memory_size: Default::default(),
 			#[cfg(target_os = "linux")]
-			thp: false,
-			#[cfg(target_os = "linux")]
-			ksm: false,
-			#[cfg(target_os = "linux")]
 			pit: false,
 			cpu_count: Default::default(),
 			#[cfg(target_os = "linux")]