Merge pull request #1749 from hermit-os/xtask-cmdline

fix(xtask): simplify QEMU cmdline creation

Author: mkroening

xtask/src/ci/qemu.rs

@@ -65,21 +65,6 @@ impl Qemu {
 		if image_name.contains("rftrace") {
 			sh.create_dir("shared/tracedir")?;
 		}
-		let machine_args = if image_name == "hermit-wasm" {
-			let mut args = self.machine_args(arch);
-
-			if args.contains(&"-append".to_string()) {
-				let last = args.last_mut().unwrap();
-				*last = format!("{last} -- {}", "/root/hello_world.wasm");
-			} else {
-				args.push("-append".to_string());
-				args.push(format!("-- {}", "/root/hello_world.wasm"));
-			}
-
-			args
-		} else {
-			self.machine_args(arch)
-		};
 
 		let qemu = env::var("QEMU").unwrap_or_else(|_| format!("qemu-system-{arch}"));
 		let program = if self.sudo { "sudo" } else { qemu.as_str() };
@@ -97,13 +82,14 @@ impl Qemu {
 			.args(&["-display", "none"])
 			.args(&["-serial", "stdio"])
 			.args(self.image_args(image, arch)?)
-			.args(machine_args)
+			.args(self.machine_args(arch))
 			.args(self.cpu_args(arch))
 			.args(&["-smp", &effective_smp.to_string()])
 			.args(&["-m".to_string(), format!("{memory}M")])
 			.args(&["-global", "virtio-mmio.force-legacy=off"])
 			.args(self.netdev_args())
-			.args(self.virtiofsd_args(memory));
+			.args(self.virtiofsd_args(memory))
+			.args(self.cmdline_args(image_name));
 
 		eprintln!("$ {qemu}");
 		let mut qemu = KillChildOnDrop(
@@ -210,7 +196,6 @@ impl Qemu {
 
 	fn machine_args(&self, arch: Arch) -> Vec<String> {
 		if self.microvm {
-			let frequency = get_frequency();
 			vec![
 				"-M".to_string(),
 				"microvm,x-option-roms=off,pit=off,pic=off,rtc=on,auto-kernel-cmdline=off,acpi=off"
@@ -219,8 +204,6 @@ impl Qemu {
 				"virtio-mmio.force-legacy=off".to_string(),
 				"-nodefaults".to_string(),
 				"-no-user-config".to_string(),
-				"-append".to_string(),
-				format!("-freq {frequency}"),
 			]
 		} else if arch == Arch::Aarch64 {
 			vec!["-machine".to_string(), "virt,gic-version=3".to_string()]
@@ -369,6 +352,38 @@ impl Qemu {
 		}
 	}
 
+	fn cmdline_args(&self, image_name: &str) -> Vec<String> {
+		let mut cmdline = self.kernel_args();
+
+		let mut app_args = self.app_args(image_name);
+		if !app_args.is_empty() {
+			cmdline.push("--".to_owned());
+			cmdline.append(&mut app_args);
+		}
+
+		if cmdline.is_empty() {
+			return vec![];
+		}
+
+		vec!["-append".to_owned(), cmdline.join(" ")]
+	}
+
+	fn kernel_args(&self) -> Vec<String> {
+		if self.microvm {
+			let frequency = get_frequency();
+			vec!["-freq".to_owned(), frequency.to_string()]
+		} else {
+			vec![]
+		}
+	}
+
+	fn app_args(&self, image_name: &str) -> Vec<String> {
+		match image_name {
+			"hermit-wasm" => vec!["/root/hello_world.wasm".to_owned()],
+			_ => vec![],
+		}
+	}
+
 	fn qemu_success(&self, status: ExitStatus, arch: Arch) -> bool {
 		if status.code().is_none() {
 			return true;