proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-05-29 18:45:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixup: use parse_property_string instead of parse_cpu_conf_basic

Browse Source 
The latter was removed and replaced with a validator.

Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
This commit is contained in:
Stefan Reiter 2020-07-09 14:41:14 +02:00 committed by Thomas Lamprecht
parent b54ba7a170
commit b53ba8d0f1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PVE/QemuMigrate.pm
View File

@ -233,7 +233,7 @@ sub prepare {
# Since the parameter itself contains no reference to a custom model, # Since the parameter itself contains no reference to a custom model,
# this makes migration independent of changes to "cpu-models.conf". # this makes migration independent of changes to "cpu-models.conf".
if ($conf->{cpu}) { if ($conf->{cpu}) {
my $cpuconf = PVE::QemuServer::CPUConfig::parse_cpu_conf_basic($conf->{cpu}); my $cpuconf = PVE::JSONSchema::parse_property_string('pve-cpu-conf', $conf->{cpu});
if ($cpuconf && PVE::QemuServer::CPUConfig::is_custom_model($cpuconf->{cputype})) { if ($cpuconf && PVE::QemuServer::CPUConfig::is_custom_model($cpuconf->{cputype})) {
$self->{forcecpu} = PVE::QemuServer::CPUConfig::get_cpu_from_running_vm($pid); $self->{forcecpu} = PVE::QemuServer::CPUConfig::get_cpu_from_running_vm($pid);
} }