test_qemu_fw: Removed smep,smap.

acidanthera · Mar 27, 2024 · d6d926c · d6d926c
1 parent 912bb9f
commit d6d926c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/test_qemu_fw.py b/test_qemu_fw.py
@@ -53,10 +53,10 @@ def test_firmware(fw_path: str, boot_drive_path: str, expected_string: str, time
         logging.error("Can't retrieve QEMU version!")
         return False
 
-    qemu_x86_runner = 'qemu-system-x86_64 -enable-kvm '
+    qemu_x86_runner = f"qemu-system-x86_64 {'-enable-kvm ' if qemu_version < (6, 2, 0) else ''}"
     qemu_arm_runner = 'qemu-system-arm '
     qemu_arm64_runner = 'qemu-system-aarch64 '
-    machine_string_x86 = f" -cpu Penryn,+smep,+smap{',+rdrand' if rdrand else ''} -smp 2 -machine q35 -m 2048 "
+    machine_string_x86 = f" -cpu Penryn{',+rdrand' if rdrand else ''} -smp 2 -machine q35 -m 2048 "
     machine_string_arm = ' -cpu cortex-a15 -smp 2 -machine virt,highmem=off ' \
                          ' -accel tcg,tb-size=1024 -m 2048 '
     machine_string_arm64 = ' -cpu cortex-a53 -smp 2 -machine virt,virtualization=on ' \