macOS actually boots this time. Woohoo!

Author: azenla

Sources/diavirt/ConfigurationBuilder.swift

@@ -91,8 +91,6 @@ extension DAVirtualMachineConfiguration {
                 configuration.pointingDevices.append(try pointingDevice.build())
             }
         }
-
-        try configuration.validate()
         return configuration
     }
 }
@@ -175,6 +173,10 @@ extension DAGenericPlatform {
             if FileManager.default.fileExists(atPath: machineIdentifierPath) {
                 let data = try Data(contentsOf: URL(fileURLWithPath: machineIdentifierPath))
                 machineIdentifier = VZMacMachineIdentifier(dataRepresentation: data)
+            } else {
+                machineIdentifier = VZMacMachineIdentifier()
+                let dataToSave = machineIdentifier!.dataRepresentation
+                try dataToSave.write(to: URL(fileURLWithPath: machineIdentifierPath))
             }
 
             platform.auxiliaryStorage = auxilaryStorage

Sources/diavirt/EntryPoint.swift

@@ -72,10 +72,12 @@ struct DiavirtCommand: ParsableCommand {
             try await Global.machine!.create()
             Global.machine?.start()
             Global.stateObserverHandle = Global.machine!.watchForState { state in
-                if state == .error {
-                    DiavirtCommand.exit(withError: ExitCode.failure)
-                } else if state == .stopped {
-                    DiavirtCommand.exit(withError: ExitCode.success)
+                Task {
+                    if state == .error {
+                        DiavirtCommand.exit(withError: ExitCode.failure)
+                    } else if state == .stopped {
+                        DiavirtCommand.exit(withError: ExitCode.success)
+                    }
                 }
             }
         }

Sources/diavirt/VirtualMachine.swift

@@ -31,7 +31,6 @@ class DAVirtualMachine: NSObject, WireProtocol, VZVirtualMachineDelegate {
         writeProtocolEvent(StateEvent("preflight.end"))
         writeProtocolEvent(StateEvent("configure.start"))
         let config = try configuration.build(wire: self, state: state!)
-        try config.validate()
         writeProtocolEvent(StateEvent("configure.end"))
         let machine = VZVirtualMachine(configuration: config)
         machine.delegate = self
@@ -40,10 +39,10 @@ class DAVirtualMachine: NSObject, WireProtocol, VZVirtualMachineDelegate {
     }
 
     func start() {
+        writeProtocolEvent(StateEvent("runtime.starting"))
         if enableInstallerMode {
             doInstallMode()
         } else {
-            writeProtocolEvent(StateEvent("runtime.starting"))
             doActualStart()
             writeProtocolEvent(StateEvent("runtime.started"))
         }
@@ -62,8 +61,9 @@ class DAVirtualMachine: NSObject, WireProtocol, VZVirtualMachineDelegate {
                         self.writeProtocolEvent(StateEvent("runtime.started"))
                     }
                 }
+                
                 DiavirtCommand.Global.installationObserver = installer.progress.observe(\.fractionCompleted, options: [.initial, .new]) { _, change in
-                    NSLog("Installation progress: \(change.newValue! * 100).")
+                    self.writeProtocolEvent(InstallationProgressEvent(progress: change.newValue! * 100.0))
                 }
             }
         }

Sources/diavirt/WireModel.swift

@@ -53,3 +53,12 @@ struct PipeDataEvent: WireEvent {
         self.data = data
     }
 }
+
+struct InstallationProgressEvent: WireEvent {
+    var type: String = "installation.progress"
+    let progress: Double
+    
+    init(progress: Double) {
+        self.progress = progress
+    }
+}

diavirt.xcodeproj/xcshareddata/xcschemes/diavirt.xcscheme

@@ -64,6 +64,10 @@
             argument = "-v"
             isEnabled = "YES">
          </CommandLineArgument>
+         <CommandLineArgument
+            argument = "-w"
+            isEnabled = "YES">
+         </CommandLineArgument>
       </CommandLineArguments>
    </LaunchAction>
    <ProfileAction