misc: Move inform to get_default_kernel_args() and fix formatting

Change-Id: I788b630d811f8268da0e87923741cf9afdef0a3e

src/python/gem5/components/boards/arm_board.py

@@ -386,6 +386,7 @@ class ArmBoard(ArmSystem, AbstractBoard, KernelDiskWorkload):
             "lpj=19988480",
             "norandmaps",
             "root={root_value}",
+            "disk_device={disk_device}",
             "rw",
             f"mem={self.get_memory().get_size()}",
         ]

src/python/gem5/components/boards/experimental/lupv_board.py

@@ -534,14 +534,19 @@ class LupvBoard(AbstractSystemBoard, KernelDiskWorkload):
         fdt.writeDtsFile(os.path.join(outdir, "device.dts"))
         fdt.writeDtbFile(os.path.join(outdir, "device.dtb"))
 
-    @overrides(KernelDiskWorkload)
-    def get_default_kernel_args(self) -> List[str]:
-        return ["console=ttyLIO0", "root={root_value}", "rw"]
-
     @overrides(KernelDiskWorkload)
     def get_default_disk_device(self) -> str:
         return "/dev/lda"
 
+    @overrides(KernelDiskWorkload)
+    def get_default_kernel_args(self) -> List[str]:
+        return [
+            "console=ttyLIO0",
+            "root={root_value}",
+            "disk_device={disk_device}",
+            "rw",
+        ]
+
     @overrides(KernelDiskWorkload)
     def _add_disk_to_board(self, disk_image: AbstractResource) -> None:
         # Note: This must be called after set_workload because it looks for an

src/python/gem5/components/boards/kernel_disk_workload.py

@@ -91,13 +91,13 @@ class KernelDiskWorkload:
 
         :returns: The disk device.
         """
-        if self._disk_device is None:
-            self._disk_device = get_default_disk_device()
-            inform(f"Disk Device set to {self._disk_device}")
-            return self._disk_device
-        else:
-            inform(f"Disk Device set to {self._disk_device}")
-            return self._disk_device
+        to_return = (
+            self._disk_device
+            if self._disk_device
+            else self.get_default_disk_device()
+        )
+        assert to_return is not None
+        return to_return
 
     @abstractmethod
     def get_default_disk_device(self) -> str:
@@ -201,7 +201,8 @@ class KernelDiskWorkload:
         self.workload.command_line = (
             " ".join(kernel_args or self.get_default_kernel_args())
         ).format(
-            root_value=self.get_default_kernel_root_val(disk_image=disk_image)
+            root_value=self.get_default_kernel_root_val(disk_image=disk_image),
+            disk_device=self.get_disk_device(),
         )
 
         # Setting the bootloader information for ARM board. The current

src/python/gem5/components/boards/riscv_board.py

@@ -494,4 +494,9 @@ class RiscvBoard(AbstractSystemBoard, KernelDiskWorkload):
 
     @overrides(KernelDiskWorkload)
     def get_default_kernel_args(self) -> List[str]:
-        return ["console=ttyS0", "root={root_value}", "rw"]
+        return [
+            "console=ttyS0",
+            "root={root_value}",
+            "disk_device={disk_device}",
+            "rw",
+        ]

src/python/gem5/components/boards/x86_board.py

@@ -318,4 +318,5 @@ class X86Board(AbstractSystemBoard, KernelDiskWorkload):
             "console=ttyS0",
             "lpj=7999923",
             "root={root_value}",
+            "disk_device={disk_device}",
         ]

src/python/gem5/prebuilt/riscvmatched/riscvmatched_board.py

@@ -566,7 +566,12 @@ class RISCVMatchedBoard(
 
     @overrides(KernelDiskWorkload)
     def get_default_kernel_args(self) -> List[str]:
-        return ["console=ttyS0", "root={root_value}", "rw"]
+        return [
+            "console=ttyS0",
+            "root={root_value}",
+            "disk_device={disk_device}",
+            "rw",
+        ]
 
     @overrides(KernelDiskWorkload)
     def set_kernel_disk_workload(