proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2026-01-04 03:34:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make hv-tlbflush and hv-evmcs optional and merge flag list

Browse Source 
Both flags were causing issues and have been made into optional flags to
be manually selected by the user if needed.

The supported flags have been merged into a single list for convenience.

Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
This commit is contained in:
Stefan Reiter 2019-07-23 13:41:28 +02:00 committed by Thomas Lamprecht
parent d5535a00c4
commit 3a040a0ead
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
PVE/QemuServer.pm
View File

@ -167,7 +167,20 @@ my $cpu_vendor_list = {
max => 'default',
};
my $cpu_flag = qr/[+-](pcid|spec-ctrl|ibpb|ssbd|virt-ssbd|amd-ssbd|amd-no-ssb|pdpe1gb|md-clear)/;
my @supported_cpu_flags = (
'pcid',
'spec-ctrl',
'ibpb',
'ssbd',
'virt-ssbd',
'amd-ssbd',
'amd-no-ssb',
'pdpe1gb',
'md-clear',
'hv-tlbflush',
'hv-evmcs'
);
my $cpu_flag = qr/[+-](@{[join('|', @supported_cpu_flags)]})/;
my $cpu_fmt = {
cputype => {
@ -193,7 +206,7 @@ my $cpu_fmt = {
flags => {
description => "List of additional CPU flags separated by ';'."
. " Use '+FLAG' to enable, '-FLAG' to disable a flag."
. " Currently supported flags: 'pcid', 'spec-ctrl', 'ibpb', 'ssbd', 'virt-ssbd', 'amd-ssbd', 'amd-no-ssb', 'pdpe1gb', 'md-clear'.",
. " Currently supported flags: @{[join(', ', @supported_cpu_flags)]}.",
format_description => '+FLAG[;-FLAG...]',
type => 'string',
pattern => qr/$cpu_flag(;$cpu_flag)*/,
@ -7274,10 +7287,7 @@ sub add_hyperv_enlightenments {
}
if (qemu_machine_feature_enabled ($machine_type, $kvmver, 3, 1)) {
push @$cpuFlags , 'hv_tlbflush';
push @$cpuFlags , 'hv_ipi';
# FIXME: AMD does not supports this currently, only add with special flag??
#push @$cpuFlags , 'hv_evmcs';
}
}
}