From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id CD1941FF179 for ; Wed, 12 Nov 2025 12:30:10 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 439E229A; Wed, 12 Nov 2025 12:30:38 +0100 (CET) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Wed, 12 Nov 2025 12:29:40 +0100 Message-ID: <20251112112959.237909-4-f.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251112112959.237909-1-f.ebner@proxmox.com> References: <20251112112959.237909-1-f.ebner@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1762946978393 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.018 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 SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH qemu-server 3/3] fix #7014: fix regression starting aarch64 VMs with machine type >= 10.1 X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" The 'virt' machine type used for 'aarch64' does not support the 'hpet' machine flag. Change add_machine_flag() to only add the flag when the current machine type supports it and rename the method to add_machine_flag_if_supported() to make the behavior obvious from the name. If a future caller really depends on adding a specific flag and would rather die when the machine type does not support it, it can check the return value whether the flag was successfully added or not. Fixes: 3a4e0144 ("cfg2cmd: turn off hpet for Linux VMs running at least kernel 2.6 and machine type >= 10.1") Signed-off-by: Fiona Ebner --- src/PVE/QemuServer.pm | 3 ++- src/PVE/QemuServer/Cfg2Cmd.pm | 26 ++++++++++++++++++++++---- src/PVE/QemuServer/Cfg2Cmd/Timer.pm | 4 ++-- 3 files changed, 26 insertions(+), 7 deletions(-) diff --git a/src/PVE/QemuServer.pm b/src/PVE/QemuServer.pm index cf195ccc..9abcd5bf 100644 --- a/src/PVE/QemuServer.pm +++ b/src/PVE/QemuServer.pm @@ -3388,7 +3388,8 @@ sub config_to_command { } # For now, handles only specific parts, but the final goal is to cover everything. - my $cfg2cmd = PVE::QemuServer::Cfg2Cmd->new($conf, $defaults, $version_guard); + my $cfg2cmd_opts = { forcemachine => $forcemachine }; + my $cfg2cmd = PVE::QemuServer::Cfg2Cmd->new($conf, $defaults, $version_guard, $cfg2cmd_opts); my $generated = $cfg2cmd->generate(); push $cmd->@*, '-global', $_ for ($generated->global_flags() // [])->@*; push $machineFlags->@*, ($generated->machine_flags() // [])->@*; diff --git a/src/PVE/QemuServer/Cfg2Cmd.pm b/src/PVE/QemuServer/Cfg2Cmd.pm index c7ee0165..36149aba 100644 --- a/src/PVE/QemuServer/Cfg2Cmd.pm +++ b/src/PVE/QemuServer/Cfg2Cmd.pm @@ -5,9 +5,10 @@ use strict; use PVE::QemuServer::Cfg2Cmd::Timer; use PVE::QemuServer::Helpers; +use PVE::QemuServer::Machine; sub new { - my ($class, $conf, $defaults, $version_guard) = @_; + my ($class, $conf, $defaults, $version_guard, $opts) = @_; my $self = bless { conf => $conf, @@ -18,6 +19,10 @@ sub new { $self->{ostype} = $self->get_prop('ostype'); $self->{'windows-version'} = PVE::QemuServer::Helpers::windows_version($self->{ostype}); + my $arch = PVE::QemuServer::Helpers::get_vm_arch($conf); + $self->{'machine-type'} = + PVE::QemuServer::Machine::get_vm_machine($conf, $opts->{forcemachine}, $arch); + return $self; } @@ -51,10 +56,23 @@ sub global_flags { return $self->{'global-flags'}; } -sub add_machine_flag { - my ($self, $flag) = @_; +=head3 add_machine_flag_if_supported - push $self->{'machine-flags'}->@*, $flag; + my $success = $self->add_machine_flag_if_supported($flag_name, $value); + +Add flag C<$flag_name> with value C<$value> to the machine flags if the current machine type +supports it. Returns whether the flag was added or not. + +=cut + +sub add_machine_flag_if_supported { + my ($self, $flag_name, $value) = @_; + + return if !PVE::QemuServer::Machine::machine_supports_flag($self->{'machine-type'}, $flag_name); + + push $self->{'machine-flags'}->@*, "${flag_name}=${value}"; + + return 1; } sub machine_flags { diff --git a/src/PVE/QemuServer/Cfg2Cmd/Timer.pm b/src/PVE/QemuServer/Cfg2Cmd/Timer.pm index 452c15b2..d03715a0 100644 --- a/src/PVE/QemuServer/Cfg2Cmd/Timer.pm +++ b/src/PVE/QemuServer/Cfg2Cmd/Timer.pm @@ -20,9 +20,9 @@ sub generate { if ($cfg2cmd->windows_version() >= 6) { $cfg2cmd->add_global_flag('kvm-pit.lost_tick_policy=discard'); - $cfg2cmd->add_machine_flag('hpet=off'); + $cfg2cmd->add_machine_flag_if_supported('hpet', 'off'); } elsif ($cfg2cmd->is_linux() && $cfg2cmd->version_guard(10, 1, 0)) { - $cfg2cmd->add_machine_flag('hpet=off'); + $cfg2cmd->add_machine_flag_if_supported('hpet', 'off'); } $cfg2cmd->add_rtc_flag('driftfix=slew') if $time_drift_fix; -- 2.47.3 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel