On Thu, Jan 22, 2026 at 4:44 PM Andrew Bailey <[email protected]> wrote:
>
> Currently, a test case is decorated to signify whether to use Scapy or
> TREX. This change allows test suites that do not use a traffic generator
> to avoid the overhead of initializing either one.
>
> Signed-off-by: Andrew Bailey <[email protected]>
<snip>
> -        if self._lshw_net_info:
> -            del self._lshw_net_info
> +        del self._lshw_net_info

This patch looks good from a functional perspective but I think there
are some git issues, for example the above snippet is just reversing a
change made in patch 2. Additionally the following change:

> -    def load_vfio(self, pf_port: Port) -> None:
> -        """Overrides :meth:'~os_session.OSSession,load_vfio`."""
> -        cmd_result = self.send_command(f"lspci -nn -s {pf_port.pci}")
> -        device = re.search(r":([0-9a-fA-F]{4})\]", cmd_result.stdout)
> -        if device and device.group(1) in ["37c8", "0435", "19e2"]:
> -            self.send_command(
> -                "modprobe -r vfio_iommu_type1; modprobe -r vfio_pci",
> -                privileged=True,
> -            )
> -            self.send_command(
> -                "modprobe -r vfio_virqfd; modprobe -r vfio",
> -                privileged=True,
> -            )
> -            self.send_command(
> -                "modprobe vfio-pci disable_denylist=1 enable_sriov=1", 
> privileged=True
> -            )
> -            self.send_command(
> -                "echo 1 | tee 
> /sys/module/vfio/parameters/enable_unsafe_noiommu_mode",
> -                privileged=True,
> -            )
> -        else:
> -            self.send_command("modprobe vfio-pci")
> -        self.refresh_lshw()

Is removed in this patch, but then added again in the next patch. The
same happens with the load_vfio method below.

> -    @abstractmethod
> -    def load_vfio(self, pf_port: Port) -> None:
> -        """Load the vfio module according to the device type of the given 
> port."""

I'm not sure if this matters all that much since the series applies
with no issues, just figured I'd point it out anyways.

Reviewed-by: Dean Marx <[email protected]>

Reply via email to