misc: moved logic of get_disk_device to workload.command_line

Change-Id: I5313bb381d5d8983b050047849fae61ea7dfc63b
This commit is contained in:
Leo Redivo
2023-09-14 11:47:19 -07:00
parent 576e8c1897
commit 020bc05928

View File

@@ -39,7 +39,6 @@ import os
from pathlib import Path
import m5
from m5.util import inform
class KernelDiskWorkload:
@@ -85,20 +84,6 @@ class KernelDiskWorkload:
"""
raise NotImplementedError
def get_disk_device(self) -> str:
"""
Get the disk device, e.g., "/dev/sda", where the disk image is placed.
:returns: The 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:
"""
@@ -202,7 +187,11 @@ class KernelDiskWorkload:
" ".join(kernel_args or self.get_default_kernel_args())
).format(
root_value=self.get_default_kernel_root_val(disk_image=disk_image),
disk_device=self.get_disk_device(),
disk_device=(
self._disk_device
if self._disk_device
else self.get_default_disk_device()
),
)
# Setting the bootloader information for ARM board. The current