From c8f582f49d7b7326b8ad6d1267c2581854a7ad32 Mon Sep 17 00:00:00 2001
From: Mykola Grymalyuk <khronokernel@icloud.com>
Date: Sat, 11 Jun 2022 11:49:55 -0600
Subject: [PATCH] Fix VMM patch set for Ventura

---
 CHANGELOG.md                 |  1 +
 payloads/Config/config.plist | 34 ++++++++++++++++++++++++++++++++--
 resources/build.py           |  3 ++-
 3 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 49a91ef4e..388c06dba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@
   - Add Kernel Debug Kit checks to Ventura root patching
   - Add USB map injection for dropped models
   - Resolve Ethernet support on MacPro3,1-5,1
+  - Fix VMM patch set
 
 ## 0.4.6
 - Fix Bluetooth support in 12.4 Release
diff --git a/payloads/Config/config.plist b/payloads/Config/config.plist
index 6cb6bf471..6f876bb42 100644
--- a/payloads/Config/config.plist
+++ b/payloads/Config/config.plist
@@ -1601,7 +1601,7 @@
 				<key>Base</key>
 				<string></string>
 				<key>Comment</key>
-				<string>Reroute kern.hv_vmm_present patch (2)</string>
+				<string>Reroute kern.hv_vmm_present patch (2) Legacy</string>
 				<key>Count</key>
 				<integer>1</integer>
 				<key>Enabled</key>
@@ -1615,7 +1615,7 @@
 				<key>Mask</key>
 				<data></data>
 				<key>MaxKernel</key>
-				<string></string>
+				<string>21.99.99</string>
 				<key>MinKernel</key>
 				<string>20.4.0</string>
 				<key>Replace</key>
@@ -1625,6 +1625,36 @@
 				<key>Skip</key>
 				<integer>0</integer>
 			</dict>
+			<dict>
+				<key>Arch</key>
+				<string>x86_64</string>
+				<key>Base</key>
+				<string></string>
+				<key>Comment</key>
+				<string>Reroute kern.hv_vmm_present patch (2) Ventura</string>
+				<key>Count</key>
+				<integer>1</integer>
+				<key>Enabled</key>
+				<false/>
+				<key>Find</key>
+				<data>Ym9vdCBzZXNzaW9uIFVVSUQAaHZfdm1tX3ByZXNlbnQA</data>
+				<key>Identifier</key>
+				<string>kernel</string>
+				<key>Limit</key>
+				<integer>0</integer>
+				<key>Mask</key>
+				<data></data>
+				<key>MaxKernel</key>
+				<string></string>
+				<key>MinKernel</key>
+				<string>22.0.0</string>
+				<key>Replace</key>
+				<data>Ym9vdCBzZXNzaW9uIFVVSUQAZGlyZWN0X2hhbmRvZmYA</data>
+				<key>ReplaceMask</key>
+				<data></data>
+				<key>Skip</key>
+				<integer>0</integer>
+			</dict>
 			<dict>
 				<key>Arch</key>
 				<string>x86_64</string>
diff --git a/resources/build.py b/resources/build.py
index 3ffe04745..bbd717d11 100644
--- a/resources/build.py
+++ b/resources/build.py
@@ -149,7 +149,8 @@ class BuildOpenCore:
 
                 print("- Enabling VMM exemption patch")
                 self.get_item_by_kv(self.config["Kernel"]["Patch"], "Comment", "Reroute kern.hv_vmm_present patch (1)")["Enabled"] = True
-                self.get_item_by_kv(self.config["Kernel"]["Patch"], "Comment", "Reroute kern.hv_vmm_present patch (2)")["Enabled"] = True
+                self.get_item_by_kv(self.config["Kernel"]["Patch"], "Comment", "Reroute kern.hv_vmm_present patch (2) Legacy")["Enabled"] = True
+                self.get_item_by_kv(self.config["Kernel"]["Patch"], "Comment", "Reroute kern.hv_vmm_present patch (2) Ventura")["Enabled"] = True
 
                 # Patch HW_BID to OC_BID
                 # Set OC_BID to iMac18,1 Board ID (Mac-F60DEB81FF30ACF6)