vm(apple): support cancelling installation

Beeenkiu · May 29, 2023 · e9b309a · e9b309a
1 parent 672ee38
commit e9b309a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/Managers/UTMAppleVirtualMachine.swift b/Managers/UTMAppleVirtualMachine.swift
@@ -59,6 +59,8 @@ import Virtualization
 
     private(set) var apple: VZVirtualMachine!
 
+    private var installProgress: Progress?
+
     private var progressObserver: NSKeyValueObservation?
 
     private var sharedDirectoriesChanged: AnyCancellable?
@@ -161,12 +163,13 @@ import Virtualization
     }
 
     override func vmStop(force: Bool) async throws {
-        guard state == .vmStarted || state == .vmPaused else {
-            return
-        }
         changeState(.vmStopping)
         do {
-            try await _vmStop(force: force)
+            if let installProgress = installProgress {
+                installProgress.cancel()
+            } else {
+                try await _vmStop(force: force)
+            }
             changeState(.vmStopped)
         } catch {
             changeState(.vmStopped)
@@ -329,13 +332,15 @@ import Virtualization
                     self.progressObserver = installer.progress.observe(\.fractionCompleted, options: [.initial, .new]) { progress, change in
                         self.delegate?.virtualMachine?(self, didUpdateInstallationProgress: progress.fractionCompleted)
                     }
+                    self.installProgress = installer.progress
                     installer.install { result in
                         continuation.resume(with: result)
                     }
                 }
             }
             changeState(.vmStarted)
             progressObserver = nil
+            installProgress = nil
             delegate?.virtualMachine?(self, didCompleteInstallation: true)
             #else
             throw UTMAppleVirtualMachineError.operatingSystemInstallNotSupported

diff --git a/Platform/macOS/Display/VMDisplayAppleWindowController.swift b/Platform/macOS/Display/VMDisplayAppleWindowController.swift
@@ -19,7 +19,7 @@ import Foundation
 class VMDisplayAppleWindowController: VMDisplayWindowController {
     var mainView: NSView?
 
-    var isInstalling: Bool = false
+    var isInstallSuccessful: Bool = false
 
     var appleVM: UTMAppleVirtualMachine! {
         vm as? UTMAppleVirtualMachine
@@ -55,7 +55,7 @@ class VMDisplayAppleWindowController: VMDisplayWindowController {
         super.windowDidLoad()
         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.isInstallSuccessful = false
                 self.appleVM.requestInstallVM(with: ipswUrl)
             }
         }
@@ -102,8 +102,8 @@ class VMDisplayAppleWindowController: VMDisplayWindowController {
 
     override func virtualMachine(_ vm: UTMVirtualMachine, didTransitionTo state: UTMVMState) {
         super.virtualMachine(vm, didTransitionTo: state)
-        if state == .vmStopped && isInstalling {
-            isInstalling = false
+        if state == .vmStopped && isInstallSuccessful {
+            isInstallSuccessful = false
             vm.requestVmStart()
         }
     }
@@ -255,8 +255,7 @@ extension VMDisplayAppleWindowController {
                 self.enterSuspended(isBusy: true)
                 self.appleConfig.system.boot.macRecoveryIpswURL = nil
                 self.appleVM.registryEntry.macRecoveryIpsw = nil
-            } else {
-                self.isInstalling = false
+                self.isInstallSuccessful = true
             }
         }
     }