test(pci): remove pci=off command line from tests

Manciukic · Manciukic · commit 7648ee772b1e · 2025-07-11T16:35:59.000+01:00
pci=off is just an optimization to skip the probing, it shouldn't matter
to the functionality of the tests. Dropping it to allow them to run with
PCI.

Signed-off-by: Riccardo Mancini &lt;mancio@amazon.com&gt;
diff --git a/tests/framework/vm_config.json b/tests/framework/vm_config.json
@@ -1,7 +1,7 @@
 {
   "boot-source": {
     "kernel_image_path": "vmlinux.bin",
-    "boot_args": "console=ttyS0 reboot=k panic=1 pci=off",
+    "boot_args": "console=ttyS0 reboot=k panic=1",
     "initrd_path": null
   },
   "drives": [
diff --git a/tests/framework/vm_config_cpu_template_C3.json b/tests/framework/vm_config_cpu_template_C3.json
@@ -1,7 +1,7 @@
 {
   "boot-source": {
     "kernel_image_path": "vmlinux.bin",
-    "boot_args": "console=ttyS0 reboot=k panic=1 pci=off"
+    "boot_args": "console=ttyS0 reboot=k panic=1"
   },
   "drives": [
     {
diff --git a/tests/framework/vm_config_missing_mem_size_mib.json b/tests/framework/vm_config_missing_mem_size_mib.json
@@ -1,7 +1,7 @@
 {
   "boot-source": {
     "kernel_image_path": "vmlinux.bin",
-    "boot_args": "console=ttyS0 reboot=k panic=1 pci=off"
+    "boot_args": "console=ttyS0 reboot=k panic=1"
   },
   "drives": [
     {
diff --git a/tests/framework/vm_config_missing_vcpu_count.json b/tests/framework/vm_config_missing_vcpu_count.json
@@ -1,7 +1,7 @@
 {
   "boot-source": {
     "kernel_image_path": "vmlinux.bin",
-    "boot_args": "console=ttyS0 reboot=k panic=1 pci=off"
+    "boot_args": "console=ttyS0 reboot=k panic=1"
   },
   "drives": [
     {
diff --git a/tests/framework/vm_config_network.json b/tests/framework/vm_config_network.json
@@ -1,7 +1,7 @@
 {
   "boot-source": {
     "kernel_image_path": "vmlinux.bin",
-    "boot_args": "console=ttyS0 reboot=k panic=1 pci=off",
+    "boot_args": "console=ttyS0 reboot=k panic=1",
     "initrd_path": null
   },
   "drives": [
diff --git a/tests/framework/vm_config_smt_true.json b/tests/framework/vm_config_smt_true.json
@@ -1,7 +1,7 @@
 {
   "boot-source": {
     "kernel_image_path": "vmlinux.bin",
-    "boot_args": "console=ttyS0 reboot=k panic=1 pci=off"
+    "boot_args": "console=ttyS0 reboot=k panic=1"
   },
   "drives": [
     {
diff --git a/tests/framework/vm_config_with_mmdsv1.json b/tests/framework/vm_config_with_mmdsv1.json
@@ -1,7 +1,7 @@
 {
   "boot-source": {
     "kernel_image_path": "vmlinux.bin",
-    "boot_args": "console=ttyS0 reboot=k panic=1 pci=off",
+    "boot_args": "console=ttyS0 reboot=k panic=1",
     "initrd_path": null
   },
   "drives": [
diff --git a/tests/framework/vm_config_with_mmdsv2.json b/tests/framework/vm_config_with_mmdsv2.json
@@ -1,7 +1,7 @@
 {
   "boot-source": {
     "kernel_image_path": "vmlinux.bin",
-    "boot_args": "console=ttyS0 reboot=k panic=1 pci=off",
+    "boot_args": "console=ttyS0 reboot=k panic=1",
     "initrd_path": null
   },
   "drives": [
diff --git a/tests/integration_tests/functional/test_error_code.py b/tests/integration_tests/functional/test_error_code.py
@@ -25,7 +25,7 @@ def test_enosys_error_code(uvm_plain):
     vm.memory_monitor = None
     vm.basic_config(
         vcpu_count=1,
-        boot_args="reboot=k panic=1 pci=off init=/usr/local/bin/devmemread",
+        boot_args="reboot=k panic=1 init=/usr/local/bin/devmemread",
     )
     vm.start()
 
diff --git a/tests/integration_tests/functional/test_kernel_cmdline.py b/tests/integration_tests/functional/test_kernel_cmdline.py
@@ -21,8 +21,7 @@ def test_init_params(uvm_plain):
     # Ubuntu version from the /etc/issue file.
     vm.basic_config(
         vcpu_count=1,
-        boot_args="console=ttyS0 reboot=k panic=1 pci=off"
-        " init=/bin/cat -- /etc/issue",
+        boot_args="console=ttyS0 reboot=k panic=1 init=/bin/cat -- /etc/issue",
     )
 
     vm.start()
diff --git a/tests/integration_tests/functional/test_serial_io.py b/tests/integration_tests/functional/test_serial_io.py
@@ -55,7 +55,7 @@ def test_serial_after_snapshot(uvm_plain, microvm_factory):
     microvm.basic_config(
         vcpu_count=2,
         mem_size_mib=256,
-        boot_args="console=ttyS0 reboot=k panic=1 pci=off",
+        boot_args="console=ttyS0 reboot=k panic=1",
     )
     serial = Serial(microvm)
     serial.open()
@@ -144,7 +144,7 @@ def test_serial_dos(uvm_plain_any):
     # Set up the microVM with 1 vCPU and a serial console.
     microvm.basic_config(
         vcpu_count=1,
-        boot_args="console=ttyS0 reboot=k panic=1 pci=off",
+        boot_args="console=ttyS0 reboot=k panic=1",
     )
     microvm.add_net_iface()
     microvm.start()
@@ -176,7 +176,7 @@ def test_serial_block(uvm_plain_any):
     test_microvm.basic_config(
         vcpu_count=1,
         mem_size_mib=512,
-        boot_args="console=ttyS0 reboot=k panic=1 pci=off",
+        boot_args="console=ttyS0 reboot=k panic=1",
     )
     test_microvm.add_net_iface()
     test_microvm.start()
diff --git a/tests/integration_tests/performance/test_boottime.py b/tests/integration_tests/performance/test_boottime.py
@@ -98,14 +98,13 @@ def launch_vm_with_boot_timer(
     microvm_factory, guest_kernel_acpi, rootfs_rw, vcpu_count, mem_size_mib, pci_enabled
 ):
     """Launches a microVM with guest-timer and returns the reported metrics for it"""
-    boot_args = DEFAULT_BOOT_ARGS if pci_enabled else DEFAULT_BOOT_ARGS + " pci=off"
-    vm = microvm_factory.build(guest_kernel_acpi, rootfs_rw)
+    vm = microvm_factory.build(guest_kernel_acpi, rootfs_rw, pci=pci_enabled)
     vm.jailer.extra_args.update({"boot-timer": None})
-    vm.spawn(pci=pci_enabled)
+    vm.spawn()
     vm.basic_config(
         vcpu_count=vcpu_count,
         mem_size_mib=mem_size_mib,
-        boot_args=boot_args + " init=/usr/local/bin/init",
+        boot_args=DEFAULT_BOOT_ARGS + " init=/usr/local/bin/init",
         enable_entropy_device=True,
     )
     vm.add_net_iface()
diff --git a/tests/integration_tests/performance/test_initrd.py b/tests/integration_tests/performance/test_initrd.py
@@ -33,7 +33,7 @@ def test_microvm_initrd_with_serial(uvm_with_initrd, huge_pages):
     vm.basic_config(
         add_root_device=False,
         vcpu_count=1,
-        boot_args="console=ttyS0 reboot=k panic=1 pci=off",
+        boot_args="console=ttyS0 reboot=k panic=1",
         use_initrd=True,
         huge_pages=huge_pages,
     )

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"boot-source": {`
`3`	`3`	`"kernel_image_path": "vmlinux.bin",`
`4`		`- "boot_args": "console=ttyS0 reboot=k panic=1 pci=off",`
	`4`	`+ "boot_args": "console=ttyS0 reboot=k panic=1",`
`5`	`5`	`"initrd_path": null`
`6`	`6`	`},`
`7`	`7`	`"drives": [`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ def test_enosys_error_code(uvm_plain):`
`25`	`25`	`vm.memory_monitor = None`
`26`	`26`	`vm.basic_config(`
`27`	`27`	`vcpu_count=1,`
`28`		`- boot_args="reboot=k panic=1 pci=off init=/usr/local/bin/devmemread",`
	`28`	`+ boot_args="reboot=k panic=1 init=/usr/local/bin/devmemread",`
`29`	`29`	`)`
`30`	`30`	`vm.start()`
`31`	`31`
Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,7 @@ def test_init_params(uvm_plain):`
`21`	`21`	`# Ubuntu version from the /etc/issue file.`
`22`	`22`	`vm.basic_config(`
`23`	`23`	`vcpu_count=1,`
`24`		`- boot_args="console=ttyS0 reboot=k panic=1 pci=off"`
`25`		`- " init=/bin/cat -- /etc/issue",`
	`24`	`+ boot_args="console=ttyS0 reboot=k panic=1 init=/bin/cat -- /etc/issue",`
`26`	`25`	`)`
`27`	`26`
`28`	`27`	`vm.start()`