mirror of
https://github.com/utmapp/UTM.git
synced 2026-10-12 02:24:01 +00:00
osy
f3645d5018
Now that the deployment targets are iOS 15 and macOS 12, every guard, fallback and workaround for an older release is dead code that only obscures what the supported path is. Remove them: - Drop the `@available` attributes for iOS 15, macOS 11 and macOS 12, and unwrap the matching `#available`/`#unavailable` guards in Swift and the `@available`/`API_AVAILABLE`/`NS_AVAILABLE_IOS` ones in Objective-C. - Delete the legacy-only views and helpers left unreachable by that: NumberTextFieldOld, VMConfigNetworkPortForwardLegacyView, VMContextMenuModifier.bodyBigSur, the nonbrokenSheet, uniqued, customBadge, borderedList and legacySettingsToolbar shims, the .unsupported BootloaderSelection case, and the iOS 14 sacrificial version Section in the QEMU settings list. - jb_has_cs_execseg_allow_unsigned() has returned false for every host since iOS 14.4, so drop it along with the is_device_A12_or_newer() helper that only it used. The entitlement parser no longer needs to copy the blob either, since that copy existed only so the psychic paper needle could be blanked in place. - VMDisplayTerminalViewController tracked the keyboard frame by hand for iOS 14. `useAutoLayout` is a constant that cannot be overridden, so nothing ever registered the notification observers and only the keyboardLayoutGuide path is reachable. - VMConfigQEMUView's additionalArguments is now referenced on iOS only, which leaves its macOS branch, and the macOS 11 ForEach crash workaround inside it, unreachable. - Raise the Cydia package floor and the postinst/prerm helpers to match the new minimum. Two of the removed guards dropped an error path rather than just a branch. The shared directory `featureNotSupported` throw covered VZVirtioFileSystemDeviceConfiguration and friends being macOS 12+, which no longer applies to any supported host. The macOS guest `platformUnsupported` throw when decoding a boot config on Intel only fired on macOS 11; the Apple Silicon requirement it really guards is enforced unconditionally in UTMAppleConfigurationSystem.fillVZConfiguration, which both the start and the save path go through. Assisted-by: Claude:claude-opus-5
86 lines
2.9 KiB
Swift
86 lines
2.9 KiB
Swift
//
|
|
// Copyright © 2022 osy. All rights reserved.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
//
|
|
|
|
import Foundation
|
|
import Virtualization
|
|
|
|
@available(iOS, unavailable, message: "Apple Virtualization not available on iOS")
|
|
struct UTMAppleConfigurationSerial: Codable, Identifiable {
|
|
enum SerialMode: String, CaseIterable, QEMUConstant {
|
|
case builtin = "Terminal"
|
|
case ptty = "Ptty"
|
|
|
|
var prettyValue: String {
|
|
switch self {
|
|
case .builtin: return NSLocalizedString("Built-in Terminal", comment: "UTMAppleConfigurationTerminal")
|
|
case .ptty: return NSLocalizedString("Pseudo-TTY Device", comment: "UTMAppleConfigurationTerminal")
|
|
}
|
|
}
|
|
}
|
|
|
|
var mode: SerialMode = .builtin
|
|
|
|
/// Terminal settings for built-in mode.
|
|
var terminal: UTMConfigurationTerminal? = .init()
|
|
|
|
/// Set to read handle before starting VM. Not saved.
|
|
var fileHandleForReading: FileHandle?
|
|
|
|
/// Set to write handle before starting VM. Not saved.
|
|
var fileHandleForWriting: FileHandle?
|
|
|
|
/// Serial interface used by the VM. Not saved.
|
|
var interface: UTMSerialPort?
|
|
|
|
let id = UUID()
|
|
|
|
enum CodingKeys: String, CodingKey {
|
|
case mode = "Mode"
|
|
case terminal = "Terminal"
|
|
}
|
|
|
|
init() {
|
|
}
|
|
|
|
init(from decoder: Decoder) throws {
|
|
let values = try decoder.container(keyedBy: CodingKeys.self)
|
|
mode = try values.decode(SerialMode.self, forKey: .mode)
|
|
terminal = try values.decodeIfPresent(UTMConfigurationTerminal.self, forKey: .terminal)
|
|
}
|
|
|
|
func encode(to encoder: Encoder) throws {
|
|
var container = encoder.container(keyedBy: CodingKeys.self)
|
|
try container.encode(mode, forKey: .mode)
|
|
// only save relevant settings
|
|
switch mode {
|
|
case .builtin:
|
|
try container.encodeIfPresent(terminal, forKey: .terminal)
|
|
default:
|
|
break
|
|
}
|
|
}
|
|
|
|
func vzSerial() -> VZSerialPortConfiguration? {
|
|
guard let fileHandleForReading = fileHandleForReading, let fileHandleForWriting = fileHandleForWriting else {
|
|
return nil
|
|
}
|
|
let attachment = VZFileHandleSerialPortAttachment(fileHandleForReading: fileHandleForReading, fileHandleForWriting: fileHandleForWriting)
|
|
let serialConfig = VZVirtioConsoleDeviceSerialPortConfiguration()
|
|
serialConfig.attachment = attachment
|
|
return serialConfig
|
|
}
|
|
}
|