From 4491b9ec0dba199fb945f46d211fbf435b6ef134 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 5 Apr 2024 12:30:36 +0200 Subject: [PATCH] nixos/test-driver: don't add QEMU_OPTS twice As the TODO says, this is already included by the script. If adding a device, including this again here would result in either two devices being added, or, if they were explicitly named, an error due to reuse of the name. --- nixos/lib/test-driver/test_driver/machine.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/nixos/lib/test-driver/test_driver/machine.py b/nixos/lib/test-driver/test_driver/machine.py index c117aab7c401..652cc600fad5 100644 --- a/nixos/lib/test-driver/test_driver/machine.py +++ b/nixos/lib/test-driver/test_driver/machine.py @@ -165,8 +165,6 @@ class StartCommand: ) if not allow_reboot: qemu_opts += " -no-reboot" - # TODO: qemu script already catpures this env variable, legacy? - qemu_opts += " " + os.environ.get("QEMU_OPTS", "") return ( f"{self._cmd}"