dnrops
/
UTM
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

config: reset CPU to default if not found 

QEMU sometimes removes CPU models. We handle this by defaulting to the
'default' CPU model when decoding the CPU model fails.

Fixes #4910
This commit is contained in:
osy 2023-02-26 16:46:07 -08:00
parent b469a8b0cc
commit d1d2899ecb
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Configuration/UTMQemuConfigurationSystem.swift
View File

@ -64,7 +64,12 @@ struct UTMQemuConfigurationSystem: Codable {
let values = try decoder.container(keyedBy: CodingKeys.self)
architecture = try values.decode(QEMUArchitecture.self, forKey: .architecture)
target = try values.decode(architecture.targetType, forKey: .target)
cpu = try values.decode(architecture.cpuType, forKey: .cpu)
do {
cpu = try values.decode(architecture.cpuType, forKey: .cpu)
} catch UTMConfigurationError.invalidConfigurationValue(let value) {
logger.warning("Unable to decode CPU '\(value)', resetting to default CPU")
cpu = architecture.cpuType.default
}
cpuFlagsAdd = try values.decode([AnyQEMUConstant].self, forKey: .cpuFlagsAdd)
cpuFlagsRemove = try values.decode([AnyQEMUConstant].self, forKey: .cpuFlagsRemove)
cpuCount = try values.decode(Int.self, forKey: .cpuCount)