settings(apple): restrict virtiofs sharing to macOS 12

Resolves utmapp#3496
lanyongly · Jan 17, 2022 · 70d5907 · 70d5907
1 parent bde8871
commit 70d5907
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 6 deletions.
diff --git a/Platform/Shared/VMWizardState.swift b/Platform/Shared/VMWizardState.swift
@@ -220,9 +220,21 @@ class VMWizardState: ObservableObject {
             #endif
             if operatingSystem == .Linux && linuxRootImageURL != nil {
                 nextPage = .sharing
+                if useAppleVirtualization {
+                    if #available(macOS 12, *) {
+                    } else {
+                        nextPage = .summary
+                    }
+                }
             }
         case .drives:
             nextPage = .sharing
+            if useAppleVirtualization {
+                if #available(macOS 12, *) {
+                } else {
+                    nextPage = .summary
+                }
+            }
         case .sharing:
             nextPage = .summary
         case .summary:

diff --git a/Platform/macOS/Display/VMDisplayAppleWindowController.swift b/Platform/macOS/Display/VMDisplayAppleWindowController.swift
@@ -89,12 +89,13 @@ class VMDisplayAppleWindowController: VMDisplayWindowController {
         drivesToolbarItem.isEnabled = false
         usbToolbarItem.isEnabled = false
         startPauseToolbarItem.isEnabled = true
-        sharedFolderToolbarItem.isEnabled = appleConfig.bootLoader?.operatingSystem == .Linux
         if #available(macOS 12, *) {
             isPowerForce = false
+            sharedFolderToolbarItem.isEnabled = appleConfig.bootLoader?.operatingSystem == .Linux
         } else {
             // stop() not available on macOS 11 for some reason
             restartToolbarItem.isEnabled = false
+            sharedFolderToolbarItem.isEnabled = false
             isPowerForce = true
         }
     }
@@ -165,6 +166,9 @@ class VMDisplayAppleWindowController: VMDisplayWindowController {
     }
 
     @IBAction override func sharedFolderButtonPressed(_ sender: Any) {
+        guard #available(macOS 12, *) else {
+            return
+        }
         if !isSharePathAlertShownOnce && !isSharePathAlertShownPersistent {
             let alert = NSAlert()
             alert.messageText = NSLocalizedString("Directory sharing", comment: "VMDisplayAppleWindowController")
@@ -182,7 +186,7 @@ class VMDisplayAppleWindowController: VMDisplayWindowController {
     }
 }
 
-@available(macOS 11, *)
+@available(macOS 12, *)
 extension VMDisplayAppleWindowController {
     func openShareMenu(_ sender: Any) {
         let menu = NSMenu()

diff --git a/Platform/macOS/VMAppleRemovableDrivesView.swift b/Platform/macOS/VMAppleRemovableDrivesView.swift
@@ -96,10 +96,12 @@ struct VMAppleRemovableDrivesView: View {
             }
             HStack {
                 Spacer()
-                Button("New Shared Directory...") {
-                    selectType = .sharedDirectory
-                    selectedSharedDirectoryBinding = nil
-                    showFileImporter()
+                if #available(macOS 12, *) {
+                    Button("New Shared Directory...") {
+                        selectType = .sharedDirectory
+                        selectedSharedDirectoryBinding = nil
+                        showFileImporter()
+                    }
                 }
                 Button("New External Drive...") {
                     selectType = .diskImage