[PATCH qemu-server v4 3/9] machine: factor out machine expanding

[Dominik Csapak <d.csapak@proxmox.com>]

So we can reuse the pc -> pc-i440fx (etc.) logic.

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 src/PVE/QemuServer/Machine.pm | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/PVE/QemuServer/Machine.pm b/src/PVE/QemuServer/Machine.pm
index 35161d1f..cf466db9 100644
--- a/src/PVE/QemuServer/Machine.pm
+++ b/src/PVE/QemuServer/Machine.pm
@@ -383,15 +383,11 @@ sub latest_installed_machine_version {
     return $version;
 }
 
-sub windows_get_pinned_machine_version {
-    my ($machine, $base_version, $kvmversion) = @_;
-
-    die "internal error - no machine provided" if !$machine;
+# expands a machine version like 'pc' or 'q35' to the full string with the
+# given pinned version, such as `pc-i440fx-10.0`
+sub expand_machine_version {
+    my ($machine, $pin_version) = @_;
 
-    my $pin_version = $base_version;
-    if (!defined($base_version) || !can_run_pve_machine_version($base_version, $kvmversion)) {
-        $pin_version = latest_installed_machine_version($kvmversion);
-    }
     if ($machine eq 'pc') {
         $machine = "pc-i440fx-$pin_version";
     } elsif ($machine eq 'q35') {
@@ -405,6 +401,21 @@ sub windows_get_pinned_machine_version {
     return $machine;
 }
 
+sub windows_get_pinned_machine_version {
+    my ($machine, $base_version, $kvmversion) = @_;
+
+    die "internal error - no machine provided" if !$machine;
+
+    my $pin_version = $base_version;
+    if (!defined($base_version) || !can_run_pve_machine_version($base_version, $kvmversion)) {
+        $pin_version = latest_installed_machine_version($kvmversion);
+    }
+
+    $machine = expand_machine_version($machine, $pin_version);
+
+    return $machine;
+}
+
 sub get_vm_machine {
     my ($conf, $forcemachine) = @_;
 
-- 
2.47.3