Merge pull request #3862 from peixiu/doscv_disable

hv_check_cpu_utilization: Change service disable methods on Win10-32
autotest · Nov 1, 2023 · bf28da8 · bf28da8
2 parents ff78c50 + d64096d
commit bf28da8
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/qemu/tests/cfg/hv_check_cpu_utilization.cfg b/qemu/tests/cfg/hv_check_cpu_utilization.cfg
@@ -10,13 +10,13 @@
     host_check_interval = 2
     serives_to_stop = wuauserv bits dosvc SysMain
     service_check_cmd = sc query %s
-    service_stop_cmd = sc stop {0} & sc config {0} start=disabled
+    # Drop this disabled method "sc config {0} start=disabled" with reg control replace.
+    service_stop_cmd = sc stop {0} & reg add "HKLM\SYSTEM\CurrentControlSet\Services\{0}" /v Start /d 4 /t REG_DWORD /f
     Win11:
         set_owner_cmd = 'WIN_UTILS:\SetACL -on "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\'
         set_owner_cmd += 'SecurityHealthService" -ot reg -actn setowner -ownr "n:Administrators"'
         set_full_control_cmd = 'WIN_UTILS:\SetACL -on "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\'
         set_full_control_cmd += 'SecurityHealthService" -ot reg -actn ace -ace "n:Administrators;p:full"'
-        service_stop_cmd = sc stop {0} & reg add "HKLM\SYSTEM\CurrentControlSet\Services\{0}" /v Start /d 4 /t REG_DWORD /f
     reg_cmd = reg add "HKLM\SYSTEM\CurrentControlSet\Services\SecurityHealthService" /v Start /d 4 /t REG_DWORD /f
     host_check_cmd = top -H -p %s -n ${host_check_times} -d ${host_check_interval} -b > fixed-top-pc-result
     vcpn_thread_pattern = r'thread_id.?[:|=]\s*(\d+)'