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

Add helpers to better structure CPU option handling

Browse Source 
To avoid hardcoding even more CPU-flag related things for custom CPU
models, introduce a dynamic approach to resolving flags.

resolve_cpu_flags takes a list of hashes (as documented in the
comment) and resolves them to a valid "-cpu" argument without
duplicates. This also helps by providing a reason why specific CPU flags
have been added, and thus allows for useful warning messages should a
flag be overwritten by another.

Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
Reviewed-By: Fabian Ebner <f.ebner@proxmox.com>
Tested-By: Fabian Ebner <f.ebner@proxmox.com>
This commit is contained in:
Stefan Reiter 2020-04-07 15:56:17 +02:00 committed by Thomas Lamprecht
parent ea1c21108f
commit 45619185a6
1 changed files with 64 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
PVE/QemuServer/CPUConfig.pm
View File

@ -320,6 +320,70 @@ sub print_cpu_device {
return "$cpu-x86_64-cpu,id=cpu$id,socket-id=$current_socket,core-id=$current_core,thread-id=0";
}
# Resolves multiple arrays of hashes representing CPU flags with metadata to a
# single string in QEMU "-cpu" compatible format. Later arrays have higher
# priority.
#
# Hashes take the following format:
# {
# aes => {
# op => "+", # defaults to "" if undefined
# reason => "to support AES acceleration", # for override warnings
# value => "" # needed for kvm=off (value: off) etc...
# },
# ...
# }
sub resolve_cpu_flags {
my $flags = {};
for my $hash (@_) {
for my $flag_name (keys %$hash) {
my $flag = $hash->{$flag_name};
my $old_flag = $flags->{$flag_name};
$flag->{op} //= "";
$flag->{reason} //= "unknown origin";
if ($old_flag) {
my $value_changed = (defined($flag->{value}) != defined($old_flag->{value})) ||
(defined($flag->{value}) && $flag->{value} ne $old_flag->{value});
if ($old_flag->{op} eq $flag->{op} && !$value_changed) {
$flags->{$flag_name}->{reason} .= " & $flag->{reason}";
next;
}
my $old = print_cpuflag_hash($flag_name, $flags->{$flag_name});
my $new = print_cpuflag_hash($flag_name, $flag);
warn "warning: CPU flag/setting $new overwrites $old\n";
}
$flags->{$flag_name} = $flag;
}
}
my $flag_str = '';
# sort for command line stability
for my $flag_name (sort keys %$flags) {
$flag_str .= ',';
$flag_str .= $flags->{$flag_name}->{op};
$flag_str .= $flag_name;
$flag_str .= "=$flags->{$flag_name}->{value}"
if $flags->{$flag_name}->{value};
}
return $flag_str;
}
sub print_cpuflag_hash {
my ($flag_name, $flag) = @_;
my $formatted = "'$flag->{op}$flag_name";
$formatted .= "=$flag->{value}" if defined($flag->{value});
$formatted .= "'";
$formatted .= " ($flag->{reason})" if defined($flag->{reason});
return $formatted;
}
# Calculate QEMU's '-cpu' argument from a given VM configuration
sub get_cpu_options {
my ($conf, $arch, $kvm, $kvm_off, $machine_version, $winversion, $gpu_passthrough) = @_;