Proxmox/qemu-server
5
0
Fork 0
mirror of git://git.proxmox.com/git/qemu-server.git synced 2025-08-03 04:21:54 +03:00
Code Releases Activity

move get_installed_machine_version() helper 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:20 +01:00
committed by Thomas Lamprecht
parent 8532a50890
commit 85d47ae2fe
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
PVE/QemuServer.pm
View File

@ -3271,13 +3271,6 @@ sub vga_conf_has_spice {
return $1 || 1;
}
sub get_installed_machine_version {
my ($kvmversion) = @_;
$kvmversion = kvm_user_version() if !defined($kvmversion);
$kvmversion =~ m/^(\d+\.\d+)/;
return $1;
}
sub windows_get_pinned_machine_version {
my ($machine, $base_version, $kvmversion) = @_;
@ -3285,7 +3278,7 @@ sub windows_get_pinned_machine_version {
if (!defined($base_version) ||
!PVE::QemuServer::Machine::can_run_pve_machine_version($base_version, $kvmversion)
) {
$pin_version = get_installed_machine_version($kvmversion);
$pin_version = PVE::QemuServer::Machine::get_installed_machine_version($kvmversion);
}
if (!$machine || $machine eq 'pc') {
$machine = "pc-i440fx-$pin_version";

7
PVE/QemuServer/Machine.pm
View File

@ -186,4 +186,11 @@ sub qemu_machine_pxe {
return $machine;
}
sub get_installed_machine_version {
my ($kvmversion) = @_;
$kvmversion = PVE::QemuServer::Helpers::kvm_user_version() if !defined($kvmversion);
$kvmversion =~ m/^(\d+\.\d+)/;
return $1;
}
1;