[pve-devel] [PATCH qemu-server v7 1/4] QemuServer: add new public get_default_vga_type function

[Aaron Lauterer <a.lauterer@proxmox.com>]

by moving that part out of get_vga_properties.

We resolve missing parameters if necessary to make it easier to call
from another module where we likely only have the VM config ready.

Signed-off-by: Aaron Lauterer <a.lauterer@proxmox.com>
---
changes since v6:
instead of making get_vga_properties and extract_version public, we
create the new get_default_vga_type function and only make it public.

 PVE/QemuServer.pm | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index ccdceed..cc08f6f 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -3414,6 +3414,27 @@ my sub print_ovmf_drive_commandlines {
     return ("if=pflash,unit=0,format=raw,readonly=on,file=$ovmf_code", $var_drive_str);
 }
 
+sub get_default_vga_type {
+    my ($conf, $arch, $machine_version, $winversion) = @_;
+
+    $arch //= PVE::QemuServer::Helpers::get_vm_arch($conf);
+    $winversion //= PVE::QemuServer::Helpers::windows_version($conf->{ostype});
+    if (!$machine_version) {
+	my $kvm_binary = PVE::QemuServer::Helpers::get_command_for_arch($arch);
+	my $kvmver = kvm_user_version($kvm_binary);
+	my $machine_type = PVE::QemuServer::Machine::get_vm_machine($conf, undef, $arch);
+	$machine_version = extract_version($machine_type, $kvmver);
+    }
+
+    if ($arch eq 'aarch64') {
+	return 'virtio';
+    } elsif (min_version($machine_version, 2, 9)) {
+	return (!$winversion || $winversion >= 6) ? 'std' : 'cirrus';
+    } else {
+	return ($winversion >= 6) ? 'std' : 'cirrus';
+    }
+}
+
 my sub get_vga_properties {
     my ($conf, $arch, $machine_version, $winversion) = @_;
 
@@ -3423,13 +3444,7 @@ my sub get_vga_properties {
     $vga->{type} = 'qxl' if $qxlnum;
 
     if (!$vga->{type}) {
-	if ($arch eq 'aarch64') {
-	    $vga->{type} = 'virtio';
-	} elsif (min_version($machine_version, 2, 9)) {
-	    $vga->{type} = (!$winversion || $winversion >= 6) ? 'std' : 'cirrus';
-	} else {
-	    $vga->{type} = ($winversion >= 6) ? 'std' : 'cirrus';
-	}
+	$vga->{type} = get_default_vga_type($conf, $arch, $machine_version, $winversion);
     }
 
     return ($vga, $qxlnum);
-- 
2.39.5



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel