utmapp/UTM
1
0
Fork 0
mirror of https://github.com/utmapp/UTM.git synced 2026-10-12 02:24:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7856 from atkinsam/fix/apple-scripting-shared-dir

Browse Source 
scripting: fix shared directory access for Apple Virtualization VMs
This commit is contained in:
osy
2026-09-19 09:02:23 -05:00
committed by GitHub
parent 56ebf381f9 f2c3ecaedc
commit a3242448ca
1 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Scripting/UTMScriptingRegistryEntryImpl.swift
+22 -8
View File
@@ -30,6 +30,10 @@ import Foundation
}
let wrapper = UTMScriptingRegistryEntryImpl(vm.registryEntry)
try await wrapper.updateRegistry(from: newRegistry, qemuProcess)
// For Apple Virtualization VMs there is no QEMU process to notify, and the
// registry -> config sync otherwise only happens incidentally via VMData's
// Combine subscription, so do it explicitly here.
await (vm as? UTMAppleVirtualMachine)?.updateConfigFromRegistry()
}
}
}
@@ -60,16 +64,26 @@ class UTMScriptingRegistryEntryImpl {
}
}
// Get bookmark from UTM process
let standardBookmark = try url.bookmarkData()
let system = system ?? UTMProcess()
let (success, bookmark, path) = await system.accessData(withBookmark: standardBookmark, securityScoped: false)
guard let bookmark = bookmark, let _ = path, success else {
throw UTMQemuVirtualMachineError.accessDriveImageFailed
let file: UTMRegistryEntry.File
if let system = system {
// QEMU backend: hand the standard bookmark off to the XPC helper so it
// mints its own security-scoped bookmark valid within its own sandbox.
let standardBookmark = try url.bookmarkData()
let (success, bookmark, path) = await system.accessData(withBookmark: standardBookmark, securityScoped: false)
guard let bookmark = bookmark, let _ = path, success else {
throw UTMQemuVirtualMachineError.accessDriveImageFailed
}
file = UTMRegistryEntry.File(dummyFromPath: url.path, remoteBookmark: bookmark)
} else {
// Apple Virtualization backend: QEMU runs in-process, so create a real
// security-scoped bookmark directly (no XPC helper to hand it off to),
// then resolve it back into a URL that actually carries the security
// scope, the same way the registry does when reloading from disk.
let bookmark = try url.persistentBookmarkData(isReadyOnly: false)
file = try UTMRegistryEntry.File(path: url.path, bookmark: bookmark)
}
// Store bookmark in registry
let file = UTMRegistryEntry.File(dummyFromPath: url.path, remoteBookmark: bookmark)
registry.appendSharedDirectory(file)
}