Proxmox/qemu-server
5
0
Fork 0
mirror of git://git.proxmox.com/git/qemu-server.git synced 2025-01-24 02:04:10 +03:00
Code Releases Activity

improve windows VM version pinning on VM creation

Browse Source 
unify code paths to ensure more consistent behavior, especially on
future changes.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2021-03-12 09:58:12 +01:00
parent 7f0285e133
commit 0761e6194a
2 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
PVE/API2/Qemu.pm
View File

@ -713,13 +713,7 @@ __PACKAGE__->register_method({
if (!$machine || $machine =~ m/^(?:pc|q35|virt)$/) {
# always pin Windows' machine version on create, they get to easily confused
if (PVE::QemuServer::windows_version($conf->{ostype})) {
my $pin_version = PVE::QemuServer::kvm_user_version();
if (!$machine || $machine eq 'pc') {
$machine = "pc-i440fx-$pin_version";
} elsif ($machine eq 'q35') {
$machine = "pc-q35-$pin_version";
}
$conf->{machine} = $machine;
$conf->{machine} = PVE::QemuServer::windows_get_pinned_machine_version($machine);
}
}

40
PVE/QemuServer.pm
View File

@ -2891,6 +2891,35 @@ my $default_machines = {
aarch64 => 'virt',
};
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) = @_;
my $pin_version = $base_version;
if (!defined($base_version) ||
!PVE::QemuServer::Machine::can_run_pve_machine_version($base_version, $kvmversion)
) {
$pin_version = get_installed_machine_version($kvmversion);
}
if (!$machine || $machine eq 'pc') {
$machine = "pc-i440fx-$pin_version";
} elsif ($machine eq 'q35') {
$machine = "pc-q35-$pin_version";
} elsif ($machine eq 'virt') {
$machine = "virt-$pin_version";
} else {
warn "unknown machine type '$machine', not touching that!\n";
}
return $machine;
}
sub get_vm_machine {
my ($conf, $forcemachine, $arch, $add_pve_version, $kvmversion) = @_;
@ -2902,16 +2931,7 @@ sub get_vm_machine {
# 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})) {
my $pin_version = '5.1';
if (!PVE::QemuServer::Machine::can_run_pve_machine_version($pin_version, $kvmversion)) {
$kvmversion =~ m/^(\d+\.\d+)/;
$pin_version = $1;
}
if (!$machine || $machine eq 'pc') {
$machine = "pc-i440fx-$pin_version";
} elsif ($machine eq 'q35') {
$machine = "pc-q35-$pin_version";
}
$machine = windows_get_pinned_machine_version($machine, '5.1', $kvmversion);
}
$arch //= 'x86_64';
$machine ||= $default_machines->{$arch};