redo VM logic names

erikng · erikng · commit 713dac36bb59 · 2024-08-01T07:52:05.000-05:00
diff --git a/Nudge/Utilities/Utils.swift b/Nudge/Utilities/Utils.swift
@@ -711,11 +711,8 @@ struct DeviceManager {
         getSysctlValue(for: "hw.model") ?? ""
     }
     
-    func getVirtualMachineStatus() -> Bool {
-        if getSysctlValue(for: "kern.hv_vmm_present") == "1" {
-            return true
-        }
-        return false
+    func isVirtualMachine() -> Bool {
+        getSysctlValue(for: "kern.hv_vmm_present") == "1"
     }
 
     func getHardwareModelIDs() -> [String] {
@@ -724,7 +721,7 @@ struct DeviceManager {
         let hardwareModelID = getIORegInfo(serviceTarget: "target-sub-type") ?? "Unknown"
         let gestaltModelStringID = getKeyResultFromGestalt("HWModelStr")
         
-        if getVirtualMachineStatus() && getCPUTypeString() == "Intel" {
+        if isVirtualMachine() && getCPUTypeString() == "Intel" {
             boardID = "VMM-x86_64"
         }
 

Original file line number	Diff line number	Diff line change
`@@ -711,11 +711,8 @@ struct DeviceManager {`
`711`	`711`	`getSysctlValue(for: "hw.model") ?? ""`
`712`	`712`	`}`
`713`	`713`
`714`		`- func getVirtualMachineStatus() -> Bool {`
`715`		`- if getSysctlValue(for: "kern.hv_vmm_present") == "1" {`
`716`		`- return true`
`717`		`- }`
`718`		`- return false`
	`714`	`+ func isVirtualMachine() -> Bool {`
	`715`	`+ getSysctlValue(for: "kern.hv_vmm_present") == "1"`
`719`	`716`	`}`
`720`	`717`
`721`	`718`	`func getHardwareModelIDs() -> [String] {`
`@@ -724,7 +721,7 @@ struct DeviceManager {`
`724`	`721`	`let hardwareModelID = getIORegInfo(serviceTarget: "target-sub-type") ?? "Unknown"`
`725`	`722`	`let gestaltModelStringID = getKeyResultFromGestalt("HWModelStr")`
`726`	`723`
`727`		`- if getVirtualMachineStatus() && getCPUTypeString() == "Intel" {`
	`724`	`+ if isVirtualMachine() && getCPUTypeString() == "Intel" {`
`728`	`725`	`boardID = "VMM-x86_64"`
`729`	`726`	`}`
`730`	`727`