From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 98339932EE for ; Mon, 19 Feb 2024 15:47:55 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 797EB31E6C for ; Mon, 19 Feb 2024 15:47:25 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Mon, 19 Feb 2024 15:47:24 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 42C7F43715 for ; Mon, 19 Feb 2024 15:47:24 +0100 (CET) Message-ID: <9e131d9f-af31-46b8-be0f-4d343d1c0d6c@proxmox.com> Date: Mon, 19 Feb 2024 15:47:23 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: Proxmox VE development discussion , Filip Schauer References: <20231219094023.25726-1-f.schauer@proxmox.com> <20231219094023.25726-4-f.schauer@proxmox.com> From: Fiona Ebner In-Reply-To: <20231219094023.25726-4-f.schauer@proxmox.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.071 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: Re: [pve-devel] [PATCH v7 qemu-server 2/4] Prevent starting a 32-bit VM using a 64-bit OVMF BIOS 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: , X-List-Received-Date: Mon, 19 Feb 2024 14:47:55 -0000 Am 19.12.23 um 10:40 schrieb Filip Schauer: > @@ -716,6 +728,33 @@ sub get_cpu_from_running_vm { > return $1; > } > > +sub get_cpu_bitness { > + my ($cpu_prop_str, $arch) = @_; > + > + die "missing 'arch'\n" if !$arch; The config's 'arch' defaults to the host arch, so we could do the same here. Then callers can just pass $conf->{arch} without checking if explicitly set. But this is also fine by me. > + > + my $cputype = get_default_cpu_type($arch, 0); > + > + if ($cpu_prop_str) { > + my $cpu = PVE::JSONSchema::parse_property_string('pve-vm-cpu-conf', $cpu_prop_str) > + or die "Cannot parse cpu description: $cpu_prop_str\n"; > + > + my $cputype = $cpu->{cputype}; > + > + if (my $model = $builtin_models->{$cputype}) { > + $cputype = $model->{'reported-model'}; > + } elsif (is_custom_model($cputype)) { > + my $custom_cpu = get_custom_model($cputype); > + $cputype = $custom_cpu->{'reported-model'} // $cpu_fmt->{'reported-model'}->{default}; > + } Missing the logic for the replacement type, i.e. if (my $replacement_type = $depreacated_cpu_map->{$cputype}) { $cputype = $replacement_type; } > + } > + > + return $cputypes_32bit->{$cputype} ? 32 : 64 if $arch eq 'x86_64'; > + return 64 if $arch eq 'aarch64'; > + > + die "unsupported architecture '$arch'\n"; > +} > + > __PACKAGE__->register(); > __PACKAGE__->init(); >