Proxmox/qemu-server
5
0
Fork 0
mirror of git://git.proxmox.com/git/qemu-server.git synced 2025-01-07 17:17:57 +03:00
Code Releases Activity

prevent starting a 32-bit VM using a 64-bit OVMF BIOS

Browse Source 
Instead of starting a VM with a 32-bit CPU type and a 64-bit OVMF image,
throw an error before starting the VM telling the user that OVMF is not
supported on 32-bit CPU types.

To obtain a list of 32-bit CPU types, refer to the builtin_x86_defs in
target/i386/cpu.c of QEMU. Exclude any entries that have the long mode
feature (CPUID_EXT2_LM).

Signed-off-by: Filip Schauer <f.schauer@proxmox.com>
This commit is contained in:
Filip Schauer 2024-02-21 15:33:14 +01:00 committed by Thomas Lamprecht
parent 5416ff700f
commit 89d5b1c90b
2 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
PVE/QemuServer.pm
View File

@ -52,7 +52,7 @@ use PVE::QemuConfig;
use PVE::QemuServer::Helpers qw(config_aware_timeout min_version windows_version);
use PVE::QemuServer::Cloudinit;
use PVE::QemuServer::CGroup;
use PVE::QemuServer::CPUConfig qw(print_cpu_device get_cpu_options);
use PVE::QemuServer::CPUConfig qw(print_cpu_device get_cpu_options get_cpu_bitness);
use PVE::QemuServer::Drive qw(is_valid_drivename drive_is_cloudinit drive_is_cdrom drive_is_read_only parse_drive print_drive);
use PVE::QemuServer::Machine;
use PVE::QemuServer::Memory qw(get_current_memory);
@ -3618,6 +3618,9 @@ sub config_to_command {
}
if ($conf->{bios} && $conf->{bios} eq 'ovmf') {
die "OVMF (UEFI) BIOS is not supported on 32-bit CPU types\n"
if !$forcecpu && get_cpu_bitness($conf->{cpu}, $arch) == 32;
my ($code_drive_str, $var_drive_str) =
print_ovmf_drive_commandlines($conf, $storecfg, $vmid, $arch, $q35, $version_guard);
push $cmd->@*, '-drive', $code_drive_str;

39
PVE/QemuServer/CPUConfig.pm
View File

@ -12,6 +12,7 @@ use base qw(PVE::SectionConfig Exporter);
our @EXPORT_OK = qw(
print_cpu_device
get_cpu_options
get_cpu_bitness
);
# under certain race-conditions, this module might be loaded before pve-cluster
@ -57,6 +58,17 @@ my $depreacated_cpu_map = {
'Icelake-Client-noTSX' => 'Icelake-Server-noTSX',
};
my $cputypes_32bit = {
'486' => 1,
'pentium' => 1,
'pentium2' => 1,
'pentium3' => 1,
'coreduo' => 1,
'athlon' => 1,
'kvm32' => 1,
'qemu32' => 1,
};
my $cpu_vendor_list = {
# Intel CPUs
486 => 'GenuineIntel',
@ -725,6 +737,33 @@ sub get_default_cpu_type {
return $cputype;
}
sub get_cpu_bitness {
my ($cpu_prop_str, $arch) = @_;
$arch //= get_host_arch();
my $cputype = get_default_cpu_type($arch, 0);
if ($cpu_prop_str) {
my $cpu = PVE::JSONSchema::parse_property_string('pve-vm-cpu-conf', $cpu_prop_str)
or die "Cannot parse cpu description: $cpu_prop_str\n";
my $cputype = $cpu->{cputype};
if (my $model = $builtin_models->{$cputype}) {
$cputype = $model->{'reported-model'};
} elsif (is_custom_model($cputype)) {
my $custom_cpu = get_custom_model($cputype);
$cputype = $custom_cpu->{'reported-model'} // $cpu_fmt->{'reported-model'}->{default};
}
}
return $cputypes_32bit->{$cputype} ? 32 : 64 if $arch eq 'x86_64';
return 64 if $arch eq 'aarch64';
die "unsupported architecture '$arch'\n";
}
__PACKAGE__->register();
__PACKAGE__->init();