From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <pve-devel-bounces@lists.proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
by lore.proxmox.com (Postfix) with ESMTPS id 015451FF15E
for <inbox@lore.proxmox.com>; Tue, 8 Apr 2025 14:27:20 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id C60CA1B9A3;
Tue, 8 Apr 2025 14:27:14 +0200 (CEST)
From: Aaron Lauterer <a.lauterer@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Tue, 8 Apr 2025 14:27:07 +0200
Message-Id: <20250408122710.1164112-2-a.lauterer@proxmox.com>
X-Mailer: git-send-email 2.39.5
In-Reply-To: <20250408122710.1164112-1-a.lauterer@proxmox.com>
References: <20250408122710.1164112-1-a.lauterer@proxmox.com>
MIME-Version: 1.0
X-SPAM-LEVEL: Spam detection results: 0
AWL -0.033 Adjusted score from AWL reputation of From: address
BAYES_00 -1.9 Bayes spam probability is 0 to 1%
DMARC_MISSING 0.1 Missing DMARC policy
KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to
Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more
information.
RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to
Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more
information.
RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to
Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more
information.
SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record
SPF_PASS -0.001 SPF: sender matches SPF record
URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See
http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more
information. [qemuserver.pm]
Subject: [pve-devel] [PATCH qemu-server v7 1/4] QemuServer: add new public
get_default_vga_type function
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: pve-devel-bounces@lists.proxmox.com
Sender: "pve-devel" <pve-devel-bounces@lists.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