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

move get_vm_machine() function to machine module

Browse Source 
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
This commit is contained in:
Fiona Ebner 2025-01-17 15:24:22 +01:00 committed by Thomas Lamprecht
parent 5c8407b0dc
commit db528966c9
3 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PVE/API2/Qemu.pm
View File

@ -852,7 +852,7 @@ sub assert_scsi_feature_compatibility {
my $drive = PVE::QemuServer::Drive::parse_drive($opt, $drive_attributes, 1); my $drive = PVE::QemuServer::Drive::parse_drive($opt, $drive_attributes, 1);
my $machine_type = PVE::QemuServer::get_vm_machine($conf, undef, $conf->{arch}); my $machine_type = PVE::QemuServer::Machine::get_vm_machine($conf, undef, $conf->{arch});
my $machine_version = PVE::QemuServer::Machine::extract_version( my $machine_version = PVE::QemuServer::Machine::extract_version(
$machine_type, PVE::QemuServer::Helpers::kvm_user_version()); $machine_type, PVE::QemuServer::Helpers::kvm_user_version());
my $drivetype = PVE::QemuServer::Drive::get_scsi_device_type( my $drivetype = PVE::QemuServer::Drive::get_scsi_device_type(

38
PVE/QemuServer.pm
View File

@ -3271,40 +3271,6 @@ sub vga_conf_has_spice {
return $1 || 1; return $1 || 1;
} }
sub get_vm_machine {
my ($conf, $forcemachine, $arch) = @_;
my $machine_conf = PVE::QemuServer::Machine::parse_machine($conf->{machine});
my $machine = $forcemachine || $machine_conf->{type};
if (!$machine || $machine =~ m/^(?:pc|q35|virt)$/) {
my $kvmversion //= kvm_user_version();
# we must pin Windows VMs without a specific version to 5.1, as 5.2 fixed a bug in ACPI
# layout which confuses windows quite a bit and may result in various regressions..
# see: https://lists.gnu.org/archive/html/qemu-devel/2021-02/msg08484.html
if (windows_version($conf->{ostype})) {
$machine = PVE::QemuServer::Machine::windows_get_pinned_machine_version($machine, '5.1', $kvmversion);
}
$arch //= 'x86_64';
$machine ||= PVE::QemuServer::Machine::default_machine_for_arch($arch);
my $pvever = PVE::QemuServer::Machine::get_pve_version($kvmversion);
$machine .= "+pve$pvever";
}
if ($machine !~ m/\+pve\d+?(?:\.pxe)?$/) {
my $is_pxe = $machine =~ m/^(.*?)\.pxe$/;
$machine = $1 if $is_pxe;
# for version-pinned machines that do not include a pve-version (e.g.
# pc-q35-4.1), we assume 0 to keep them stable in case we bump
$machine .= '+pve0';
$machine .= '.pxe' if $is_pxe;
}
return $machine;
}
sub get_ovmf_files($$$) { sub get_ovmf_files($$$) {
my ($arch, $efidisk, $smm) = @_; my ($arch, $efidisk, $smm) = @_;
@ -3560,7 +3526,7 @@ sub config_to_command {
die "Detected old QEMU binary ('$kvmver', at least 5.0 is required)\n"; die "Detected old QEMU binary ('$kvmver', at least 5.0 is required)\n";
} }
my $machine_type = get_vm_machine($conf, $forcemachine, $arch); my $machine_type = PVE::QemuServer::Machine::get_vm_machine($conf, $forcemachine, $arch);
my $machine_version = extract_version($machine_type, $kvmver); my $machine_version = extract_version($machine_type, $kvmver);
$kvm //= 1 if is_native_arch($arch); $kvm //= 1 if is_native_arch($arch);
@ -4874,7 +4840,7 @@ sub vmconfig_hotplug_pending {
my $defaults = load_defaults(); my $defaults = load_defaults();
my $arch = PVE::QemuServer::Helpers::get_vm_arch($conf); my $arch = PVE::QemuServer::Helpers::get_vm_arch($conf);
my $machine_type = get_vm_machine($conf, undef, $arch); my $machine_type = PVE::QemuServer::Machine::get_vm_machine($conf, undef, $arch);
# commit values which do not have any impact on running VM first # commit values which do not have any impact on running VM first
# Note: those option cannot raise errors, we we do not care about # Note: those option cannot raise errors, we we do not care about

34
PVE/QemuServer/Machine.pm
View File

@ -213,4 +213,38 @@ sub windows_get_pinned_machine_version {
return $machine; return $machine;
} }
sub get_vm_machine {
my ($conf, $forcemachine, $arch) = @_;
my $machine_conf = parse_machine($conf->{machine});
my $machine = $forcemachine || $machine_conf->{type};
if (!$machine || $machine =~ m/^(?:pc|q35|virt)$/) {
my $kvmversion //= PVE::QemuServer::Helpers::kvm_user_version();
# we must pin Windows VMs without a specific version to 5.1, as 5.2 fixed a bug in ACPI
# layout which confuses windows quite a bit and may result in various regressions..
# see: https://lists.gnu.org/archive/html/qemu-devel/2021-02/msg08484.html
if (PVE::QemuServer::Helpers::windows_version($conf->{ostype})) {
$machine = windows_get_pinned_machine_version($machine, '5.1', $kvmversion);
}
$arch //= 'x86_64';
$machine ||= default_machine_for_arch($arch);
my $pvever = get_pve_version($kvmversion);
$machine .= "+pve$pvever";
}
if ($machine !~ m/\+pve\d+?(?:\.pxe)?$/) {
my $is_pxe = $machine =~ m/^(.*?)\.pxe$/;
$machine = $1 if $is_pxe;
# for version-pinned machines that do not include a pve-version (e.g.
# pc-q35-4.1), we assume 0 to keep them stable in case we bump
$machine .= '+pve0';
$machine .= '.pxe' if $is_pxe;
}
return $machine;
}
1; 1;