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

don't use amd64-specific cpu options on arm

Browse Source 
FIXME: This function needs proper reorganisation...

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2018-11-12 14:10:43 +01:00 committed by Thomas Lamprecht
parent d559309fcf
commit 1ea63c15bf
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
PVE/QemuServer.pm
View File

@ -3344,7 +3344,7 @@ sub get_cpu_options {
} }
} }
push @$cpuFlags , '+lahf_lm' if $cpu eq 'kvm64'; push @$cpuFlags , '+lahf_lm' if $cpu eq 'kvm64' && $arch eq 'x86_64';
push @$cpuFlags , '-x2apic' push @$cpuFlags , '-x2apic'
if $conf->{ostype} && $conf->{ostype} eq 'solaris'; if $conf->{ostype} && $conf->{ostype} eq 'solaris';
@ -3353,7 +3353,7 @@ sub get_cpu_options {
push @$cpuFlags, '-rdtscp' if $cpu =~ m/^Opteron/; push @$cpuFlags, '-rdtscp' if $cpu =~ m/^Opteron/;
if (qemu_machine_feature_enabled ($machine_type, $kvmver, 2, 3)) { if (qemu_machine_feature_enabled ($machine_type, $kvmver, 2, 3) && $arch eq 'x86_64') {
push @$cpuFlags , '+kvm_pv_unhalt' if $kvm; push @$cpuFlags , '+kvm_pv_unhalt' if $kvm;
push @$cpuFlags , '+kvm_pv_eoi' if $kvm; push @$cpuFlags , '+kvm_pv_eoi' if $kvm;
@ -3361,7 +3361,7 @@ sub get_cpu_options {
add_hyperv_enlightenments($cpuFlags, $winversion, $machine_type, $kvmver, $conf->{bios}, $gpu_passthrough) if $kvm; add_hyperv_enlightenments($cpuFlags, $winversion, $machine_type, $kvmver, $conf->{bios}, $gpu_passthrough) if $kvm;
push @$cpuFlags, 'enforce' if $cpu ne 'host' && $kvm; push @$cpuFlags, 'enforce' if $cpu ne 'host' && $kvm && $arch eq 'x86_64';
push @$cpuFlags, 'kvm=off' if $kvm_off; push @$cpuFlags, 'kvm=off' if $kvm_off;