Merge pull request autotest#5456 from dzhengfy/fix_cpu_model

vcpu_misc: fix cpu model for arm
chunfuwen · Feb 26, 2024 · 724ff47 · 724ff47
2 parents 996e4d0 + 8518010
commit 724ff47
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/libvirt/tests/cfg/cpu/vcpu_misc.cfg b/libvirt/tests/cfg/cpu/vcpu_misc.cfg
@@ -8,12 +8,15 @@
                 - snapshot:
                     cpu_mode = "host-model"
                     test_operations = "do_snapshot"
-                    expected_str_before_startup = ${cpu_mode}
                     expected_str_after_startup = 'mode="custom"'
+                    aarch64:
+                        cpu_mode = "host-passthrough"
+                        expected_str_after_startup = ${cpu_mode}
                     pseries:
                         expected_str_after_startup = ${cpu_mode}
+                    expected_str_before_startup = ${cpu_mode}
                 - vendor_id:
-                    no pseries, s390x
+                    no pseries, s390x, aarch64
                     cpu_mode = "host-model"
                     check_vendor_id = "yes"
                 - with_topology:
@@ -32,8 +35,8 @@
                     expected_str_after_startup = 'mode="host-passthrough"'
                     customize_cpu_features = "yes"
                 - with_maxphysaddr:
-                    no s390-virtio
-                    func_supported_since_libvirt_ver = (9, 3, 0)                    
+                    no s390-virtio,aarch64
+                    func_supported_since_libvirt_ver = (9, 3, 0)
                     maxphysaddr = {'mode': 'passthrough', 'limit':'%d'}
                     expected_qemuline = "host-phys-bits-limit=%s"
                     cmd_in_guest = "lscpu|grep Address"