From cf1678f43f6faab30e2195040dbb235b08a350e9 Mon Sep 17 00:00:00 2001 From: Leo Redivo Date: Fri, 4 Aug 2023 13:08:41 -0700 Subject: [PATCH] misc: Fix pre-commit formatting issues Change-Id: I50e71cfc21d43c2c17da52cf2f40591599907548 --- .../gem5/components/boards/arm_board.py | 2 +- .../boards/experimental/lupv_board.py | 2 +- .../components/boards/kernel_disk_workload.py | 19 +++++++++---------- .../gem5/components/boards/riscv_board.py | 2 +- .../gem5/components/boards/x86_board.py | 2 +- .../riscvmatched/riscvmatched_board.py | 2 +- 6 files changed, 14 insertions(+), 15 deletions(-) diff --git a/src/python/gem5/components/boards/arm_board.py b/src/python/gem5/components/boards/arm_board.py index 82b7a39107..451bb8d7dc 100644 --- a/src/python/gem5/components/boards/arm_board.py +++ b/src/python/gem5/components/boards/arm_board.py @@ -354,7 +354,7 @@ class ArmBoard(ArmSystem, AbstractBoard, KernelDiskWorkload): ) @overrides(KernelDiskWorkload) - def _get_default_disk_device(self): + def get_default_disk_device(self): return "/dev/vda" @overrides(KernelDiskWorkload) diff --git a/src/python/gem5/components/boards/experimental/lupv_board.py b/src/python/gem5/components/boards/experimental/lupv_board.py index cba50a1d56..f56a8804ed 100644 --- a/src/python/gem5/components/boards/experimental/lupv_board.py +++ b/src/python/gem5/components/boards/experimental/lupv_board.py @@ -539,7 +539,7 @@ class LupvBoard(AbstractSystemBoard, KernelDiskWorkload): return ["console=ttyLIO0", "root={root_value}", "rw"] @overrides(KernelDiskWorkload) - def set_default_disk_device(self) -> str: + def get_default_disk_device(self) -> str: return "/dev/lda" @overrides(KernelDiskWorkload) diff --git a/src/python/gem5/components/boards/kernel_disk_workload.py b/src/python/gem5/components/boards/kernel_disk_workload.py index 79d55ba8b4..435de35f82 100644 --- a/src/python/gem5/components/boards/kernel_disk_workload.py +++ b/src/python/gem5/components/boards/kernel_disk_workload.py @@ -39,7 +39,7 @@ import os from pathlib import Path import m5 -from m5 import warn +from m5.util import inform class KernelDiskWorkload: @@ -92,15 +92,15 @@ class KernelDiskWorkload: :returns: The disk device. """ if self._disk_device is None: - warn("No disk device set, ie where the disk image is located. Defaulting to board disk device") - return _get_default_disk_device() - else: + 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 - - @abstractmethod - def _get_default_disk_device(self) -> str: + def get_default_disk_device(self) -> str: """ Set a default disk device, in case user does not specify a disk device. @@ -154,7 +154,7 @@ class KernelDiskWorkload: kernel: KernelResource, disk_image: DiskImageResource, bootloader: Optional[BootloaderResource] = None, - _disk_device: Optional[str] = None, + disk_device: Optional[str] = None, readfile: Optional[str] = None, readfile_contents: Optional[str] = None, kernel_args: Optional[List[str]] = None, @@ -188,7 +188,7 @@ class KernelDiskWorkload: assert isinstance(self, AbstractBoard) # Set the disk device - self._disk_device = _disk_device + self._disk_device = disk_device # If we are setting a workload of this type, we need to run as a # full-system simulation. @@ -211,7 +211,6 @@ class KernelDiskWorkload: if bootloader is not None: self._bootloader = [bootloader.get_local_path()] - # Set the readfile. if readfile: self.readfile = readfile diff --git a/src/python/gem5/components/boards/riscv_board.py b/src/python/gem5/components/boards/riscv_board.py index d8020d1974..c12ad21e70 100644 --- a/src/python/gem5/components/boards/riscv_board.py +++ b/src/python/gem5/components/boards/riscv_board.py @@ -467,7 +467,7 @@ class RiscvBoard(AbstractSystemBoard, KernelDiskWorkload): fdt.writeDtbFile(os.path.join(outdir, "device.dtb")) @overrides(KernelDiskWorkload) - def _get_default_disk_device(self): + def get_default_disk_device(self): return "/dev/vda" @overrides(KernelDiskWorkload) diff --git a/src/python/gem5/components/boards/x86_board.py b/src/python/gem5/components/boards/x86_board.py index 1a3b9fa1c8..7541cdc415 100644 --- a/src/python/gem5/components/boards/x86_board.py +++ b/src/python/gem5/components/boards/x86_board.py @@ -296,7 +296,7 @@ class X86Board(AbstractSystemBoard, KernelDiskWorkload): ] @overrides(KernelDiskWorkload) - def _get_default_disk_device(self): + def get_default_disk_device(self): return "/dev/hda" @overrides(KernelDiskWorkload) diff --git a/src/python/gem5/prebuilt/riscvmatched/riscvmatched_board.py b/src/python/gem5/prebuilt/riscvmatched/riscvmatched_board.py index 3411ea61be..5f26d0500d 100644 --- a/src/python/gem5/prebuilt/riscvmatched/riscvmatched_board.py +++ b/src/python/gem5/prebuilt/riscvmatched/riscvmatched_board.py @@ -539,7 +539,7 @@ class RISCVMatchedBoard( fdt.writeDtbFile(os.path.join(outdir, "device.dtb")) @overrides(KernelDiskWorkload) - def _get_default_disk_device(self): + def get_default_disk_device(self): return "/dev/vda" @overrides(KernelDiskWorkload)