From 2aa92bf4b4ec1c717caccbb10e2edb81902bdaa9 Mon Sep 17 00:00:00 2001
From: Muminul Islam <muislam@microsoft.com>
Date: Sat, 7 Mar 2026 22:07:18 -0800
Subject: [PATCH] tests: Add platform argument support to kernel cmdline
 builder

Introduce default_kernel_cmdline_with_platform() in GuestCommand
that accepts an optional platform parameter. For confidential
VMs, the platform arg is prepended to sev_snp=on. For regular
VMs, it is passed via --platform if provided.

Retain default_kernel_cmdline() as a convenience wrapper that
calls the new method with None, preserving backward
compatibility.

This enables tests to pass additional platform configuration
such as num_pci_segments alongside the default kernel and
cmdline setup.

Signed-off-by: Muminul Islam <muislam@microsoft.com>
---
 test_infra/src/lib.rs | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/test_infra/src/lib.rs b/test_infra/src/lib.rs
index e1af41bc0..b6d7641f6 100644
--- a/test_infra/src/lib.rs
+++ b/test_infra/src/lib.rs
@@ -1694,7 +1694,7 @@ impl<'a> GuestCommand<'a> {
         self.args(["--net", self.guest.default_net_string().as_str()])
     }
 
-    pub fn default_kernel_cmdline(&mut self) -> &mut Self {
+    pub fn default_kernel_cmdline_with_platform(&mut self, platform: Option<&str>) -> &mut Self {
         if self.guest.vm_type == GuestVmType::Confidential {
             let console_str = if let Some(c) = &self.guest.console_type {
                 c.as_str()
@@ -1709,17 +1709,34 @@ impl<'a> GuestCommand<'a> {
             ]);
             self.command
                 .args(["--host-data", generate_host_data().as_str()]);
-            self.command.args(["--platform", "sev_snp=on"]);
+            self.command.args([
+                "--platform",
+                &format!(
+                    "{}sev_snp=on",
+                    if let Some(p) = platform {
+                        format!("{p},")
+                    } else {
+                        String::new()
+                    }
+                ),
+            ]);
         } else if let Some(kernel) = &self.guest.kernel_path {
             self.command.args(["--kernel", kernel.as_str()]);
             if let Some(cmdline) = &self.guest.kernel_cmdline {
                 self.command.args(["--cmdline", cmdline]);
             }
+            if let Some(platform_arg) = platform {
+                self.command.args(["--platform", platform_arg]);
+            }
         }
 
         self
     }
 
+    pub fn default_kernel_cmdline(&mut self) -> &mut Self {
+        self.default_kernel_cmdline_with_platform(None)
+    }
+
     pub fn default_cpus(&mut self) -> &mut Self {
         self.args(["--cpus", self.guest.default_cpus_string().as_str()])
     }