config(apple): move recovery ipsw setting and fixup key names

Configuration/UTMAppleConfigurationBoot.swift

@@ -41,6 +41,9 @@ struct UTMAppleConfigurationBoot: Codable {
     var efiVariableStorageURL: URL?
     var hasUefiBoot: Bool = false
     
+    /// IPSW for installing macOS. Not saved.
+    var macRecoveryIpswURL: URL?
+    
     /// Next startup should be in recovery. Not saved.
     var startUpFromMacOSRecovery: Bool = false
     

Configuration/UTMAppleConfigurationMacPlatform.swift

@@ -25,9 +25,9 @@ struct UTMAppleConfigurationMacPlatform: Codable {
     var auxiliaryStorageURL: URL?
     
     private enum CodingKeys: String, CodingKey {
-        case hardwareModel
-        case machineIdentifier
-        case auxiliaryStoragePath
+        case hardwareModel = "HardwareModel"
+        case machineIdentifier = "MachineIdentifier"
+        case auxiliaryStoragePath = "AuxiliaryStoragePath"
     }
     
     init(from decoder: Decoder) throws {

Configuration/UTMAppleConfigurationSystem.swift

@@ -100,7 +100,7 @@ extension UTMAppleConfigurationSystem {
             if let oldPlatform = oldConfig.macPlatform {
                 macPlatform = UTMAppleConfigurationMacPlatform(migrating: oldPlatform)
             }
-            macRecoveryIpswURL = oldConfig.macRecoveryIpswURL
+            boot.macRecoveryIpswURL = oldConfig.macRecoveryIpswURL
         }
         #endif
     }

Managers/UTMAppleVirtualMachine.swift

@@ -73,7 +73,7 @@ import Virtualization
         // copy non-persistent values over
         newConfig.sharedDirectories = oldConfig.sharedDirectories
         if #available(macOS 12, *) {
-            newConfig.system.macRecoveryIpswURL = oldConfig.system.macRecoveryIpswURL
+            newConfig.system.boot.macRecoveryIpswURL = oldConfig.system.boot.macRecoveryIpswURL
         }
         config = UTMConfigurationWrapper(wrapping: newConfig)
     }

Platform/Shared/UTMDownloadIPSWTask.swift

@@ -29,7 +29,7 @@ class UTMDownloadIPSWTask: UTMDownloadTask {
     
     init(for config: UTMAppleConfiguration) {
         self.config = config
-        super.init(for: config.system.macRecoveryIpswURL!, named: config.information.name)
+        super.init(for: config.system.boot.macRecoveryIpswURL!, named: config.information.name)
     }
     
     override func processCompletedDownload(at location: URL) async throws -> UTMVirtualMachine {
@@ -38,7 +38,7 @@ class UTMDownloadIPSWTask: UTMDownloadTask {
             try fileManager.removeItem(at: cacheIpsw)
         }
         try fileManager.moveItem(at: location, to: cacheIpsw)
-        config.system.macRecoveryIpswURL = cacheIpsw
+        config.system.boot.macRecoveryIpswURL = cacheIpsw
         return UTMVirtualMachine(newConfig: config, destinationURL: UTMData.defaultStorageUrl)
     }
 }

Platform/Shared/VMWizardState.swift

@@ -259,7 +259,7 @@ enum VMWizardOS: String, Identifiable {
             #if os(macOS) && arch(arm64)
             if #available(macOS 12, *) {
                 config.system.boot = try! UTMAppleConfigurationBoot(for: .macOS)
-                config.system.macRecoveryIpswURL = macRecoveryIpswURL
+                config.system.boot.macRecoveryIpswURL = macRecoveryIpswURL
                 config.system.macPlatform = macPlatform
             }
             #endif

Platform/macOS/Display/VMDisplayAppleWindowController.swift

@@ -69,10 +69,10 @@ class VMDisplayAppleWindowController: VMDisplayWindowController {
         appleVM.screenshotDelegate = self
         window!.recalculateKeyViewLoop()
         if #available(macOS 12, *) {
-            shouldAutoStartVM = appleConfig.system.macRecoveryIpswURL == nil
+            shouldAutoStartVM = appleConfig.system.boot.macRecoveryIpswURL == nil
         }
         super.windowDidLoad()
-        if #available(macOS 12, *), let ipswUrl = appleConfig.system.macRecoveryIpswURL {
+        if #available(macOS 12, *), let ipswUrl = appleConfig.system.boot.macRecoveryIpswURL {
             showConfirmAlert(NSLocalizedString("Would you like to install macOS? If an existing operating system is already installed on the primary drive of this VM, then it will be erased.", comment: "VMDisplayAppleWindowController")) {
                 self.isInstalling = true
                 self.appleVM.requestInstallVM(with: ipswUrl)
@@ -312,7 +312,7 @@ extension VMDisplayAppleWindowController {
             self.isInstalling = false
             // delete IPSW setting
             self.enterSuspended(isBusy: true)
-            self.appleConfig.system.macRecoveryIpswURL = nil
+            self.appleConfig.system.boot.macRecoveryIpswURL = nil
             // start VM
             self.vm.requestVmStart()
         }

Platform/macOS/VMConfigAppleBootView.swift

@@ -107,10 +107,10 @@ struct VMConfigAppleBootView: View {
                 #if arch(arm64)
                 Section(header: Text("macOS Settings")) {
                     HStack {
-                        TextField("IPSW Install Image", text: .constant(config.macRecoveryIpswURL?.lastPathComponent ?? ""))
+                        TextField("IPSW Install Image", text: .constant(config.boot.macRecoveryIpswURL?.lastPathComponent ?? ""))
                             .disabled(true)
                         Button("Clear") {
-                            config.macRecoveryIpswURL = nil
+                            config.boot.macRecoveryIpswURL = nil
                         }
                         Button("Browse…") {
                             importBootloaderSelection = .ipsw
@@ -143,7 +143,7 @@ struct VMConfigAppleBootView: View {
                         }
                         config.macPlatform = UTMAppleConfigurationMacPlatform(newHardware: model)
                         config.boot.operatingSystem = .macOS
-                        config.macRecoveryIpswURL = url
+                        config.boot.macRecoveryIpswURL = url
                         #endif
                     }
                 case .kernel: