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 900C21FF179 for ; Wed, 12 Nov 2025 12:29:52 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C59E416E; Wed, 12 Nov 2025 12:30:36 +0100 (CET) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Wed, 12 Nov 2025 12:29:38 +0100 Message-ID: <20251112112959.237909-2-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: 1762946978281 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 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. [machine.pm] Subject: [pve-devel] [PATCH qemu-server 1/3] machine: add machine_base_type() helper 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" Use the helper for machine_type_is_q35() to start out. The plan is to re-use the helper for a function checking which machine flags are supported for a given machine type. Signed-off-by: Fiona Ebner --- src/PVE/QemuServer/Machine.pm | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/src/PVE/QemuServer/Machine.pm b/src/PVE/QemuServer/Machine.pm index b2ff7e24..7a401087 100644 --- a/src/PVE/QemuServer/Machine.pm +++ b/src/PVE/QemuServer/Machine.pm @@ -142,11 +142,34 @@ sub assert_valid_machine_property { if $machine_conf->{'aw-bits'} && !$machine_conf->{viommu}; } +=head3 machine_base_type + + my $base_type = machine_base_type($machine_type); + +Returns the base type of the machine, currently either C, C or C. A value must be +passed in. Dies if the machine type cannot be determined, but should not happen if it is valid for +the C<$machine_fmt> schema. + +=cut + +my sub machine_base_type { + my ($machine_type) = @_; + + die "unable to determine machine base type - no value\n" if !$machine_type; + + return 'q35' if $machine_type =~ m/q35/; + return 'i440fx' if $machine_type =~ m/^pc/; + return 'virt' if $machine_type =~ m/^virt/; + + die "unable to determine machine base type '$machine_type'\n"; +} + sub machine_type_is_q35 { my ($conf) = @_; my $machine_conf = parse_machine($conf->{machine}); - return $machine_conf->{type} && ($machine_conf->{type} =~ m/q35/) ? 1 : 0; + return 0 if !$machine_conf || !$machine_conf->{type}; + return machine_base_type($machine_conf->{type}) eq 'q35' ? 1 : 0; } # In list context, also returns whether the current machine is deprecated or not. -- 2.47.3 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel