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

cpu config: minor code style nits/comment

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2022-08-30 09:01:40 +02:00
parent 161c2dde4b
commit b0ab346381
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
PVE/QemuServer/CPUConfig.pm
View File

@ -357,8 +357,7 @@ sub print_cpu_device {
if (is_custom_model($cpu)) { if (is_custom_model($cpu)) {
my $custom_cpu = get_custom_model($cpu); my $custom_cpu = get_custom_model($cpu);
$cpu = $custom_cpu->{'reported-model'} // $cpu = $custom_cpu->{'reported-model'} // $cpu_fmt->{'reported-model'}->{default};
$cpu_fmt->{'reported-model'}->{default};
} }
} }
@ -367,6 +366,7 @@ sub print_cpu_device {
my $current_core = ($id - 1) % $cores; my $current_core = ($id - 1) % $cores;
my $current_socket = int(($id - 1 - $current_core)/$cores); my $current_socket = int(($id - 1 - $current_core)/$cores);
# FIXME: hot plugging other architectures like our unofficial arch64 support?
return "$cpu-x86_64-cpu,id=cpu$id,socket-id=$current_socket,core-id=$current_core,thread-id=0"; return "$cpu-x86_64-cpu,id=cpu$id,socket-id=$current_socket,core-id=$current_core,thread-id=0";
} }
@ -470,18 +470,14 @@ sub get_cpu_options {
if (is_custom_model($cputype)) { if (is_custom_model($cputype)) {
$custom_cpu = get_custom_model($cputype); $custom_cpu = get_custom_model($cputype);
$cputype = $custom_cpu->{'reported-model'} // $cputype = $custom_cpu->{'reported-model'} // $cpu_fmt->{'reported-model'}->{default};
$cpu_fmt->{'reported-model'}->{default}; $kvm_off = $custom_cpu->{hidden} if defined($custom_cpu->{hidden});
$kvm_off = $custom_cpu->{hidden}
if defined($custom_cpu->{hidden});
$hv_vendor_id = $custom_cpu->{'hv-vendor-id'}; $hv_vendor_id = $custom_cpu->{'hv-vendor-id'};
} }
# VM-specific settings override custom CPU config # VM-specific settings override custom CPU config
$kvm_off = $cpu->{hidden} $kvm_off = $cpu->{hidden} if defined($cpu->{hidden});
if defined($cpu->{hidden}); $hv_vendor_id = $cpu->{'hv-vendor-id'} if defined($cpu->{'hv-vendor-id'});
$hv_vendor_id = $cpu->{'hv-vendor-id'}
if defined($cpu->{'hv-vendor-id'});
} }
my $pve_flags = get_pve_cpu_flags($conf, $kvm, $cputype, $arch, $machine_version); my $pve_flags = get_pve_cpu_flags($conf, $kvm, $cputype, $arch, $machine_version);