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 DD8566A6E8 for ; Thu, 25 Mar 2021 19:17:21 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id CE69F20117 for ; Thu, 25 Mar 2021 19:17:21 +0100 (CET) Received: from mo4-p00-ob.smtp.rzone.de (mo4-p00-ob.smtp.rzone.de [81.169.146.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id AA1062010C for ; Thu, 25 Mar 2021 19:17:20 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; t=1616696057; cv=none; d=strato.com; s=strato-dkim-0002; b=RZV8i5Rim07ARwiNHVn6y+FP3hhpvlSq0KljDqnERRaP5ohmtw5K5OE+UVLKnS5/T3 YerZ8xZl14jDqORxuGnmq19cLZpkHYRHlrcQjVs1aGw5wYLJw2baxf/NH1WIBMCgO1Da x1DmdVejiz/UkZwJM25KLtgKB1dzI2Conl0nuDHVMPbUU9uLSFmnaPXjEUFKXs1G95k1 zzt0n0TFMeA5mUum8nmU6p4bOqxGHAKhpDpmh99/ZXbHgcSHq0w7lAjqwefCnQ3KeTEg yqN3R8nYa8hCscPd6IeAlsmAwVfYtILWFmzp/2wdhnH5/cwkzIbY1GGNexjRXeWT/OJK rbXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1616696057; s=strato-dkim-0002; d=strato.com; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=2lQv/Zw+ythpuxgfXExOhCBvQEHblzWLRGh9orHLpDM=; b=JuCOP8CdjAl+4EZQJSXzsVT8JI1d29CHtaGQVz0aRaUKhoyzEtVD2wiJNBOYXk6A2a z3UbpJgLwf8GpTSmAM1oCBy7qJzBiMQ1U3Ql/Ay1FZWxFPcximmCJMSbWvlcbj4VL/xd qdpxFgIwW2JMOmQtNPYGXrgurHtzwnrPxJIp8+tmywhSdYNM51ORi/aKiQrPj4pKreD1 2Ky4HSfJigDTFHuCybZGGaiIL+ATqJpUcH+mpjkKwYY3ZSOBTQUxEQ2XuT7fKmzndo43 ASUG1wugsEZLy78QCivGAjcwuTD5wqAAC2SMA2SuNQ7Wx9sTqWyXCNtu+WFSxUD+kJCY GcUg== ARC-Authentication-Results: i=1; strato.com; dkim=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1616696057; s=strato-dkim-0002; d=berneking.net; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=2lQv/Zw+ythpuxgfXExOhCBvQEHblzWLRGh9orHLpDM=; b=Brr8lq6GLIlCn61nt6F3m/iWxlbabxVPuBj5cnvNBdNO6ACkkbEqpI5rQSrjaX8tlF gmH4StrVMi6UOJ6d6wDvnpiYSiO24ZVhU4v87jN0V8nCUoKX8PC97syHoDT5LQswiNtD Il48bhWmdAwmcrF/IfGxRrcHkv25fGcI00nGD43PbK0M4f91hCbFzRjq70gWbXA+EeZT XVqshJh0xI/J8cNHvFqUOG2plt7AiAC0ZQQ2k6shaeZsHZtv1Bp+RnAvKFVjzuMfniiR 0Wr9TfjcjMT6U5YhsA02H26rUjpbAQrsXrrtGFGkLYTPOFpx/QehBBIXW7UoFc4rVmyK LRog== Authentication-Results: strato.com; dkim=none X-RZG-AUTH: ":IHkHdGCqfu0qoeJoEbKVgTf+/O6Y0B1F6HvRsLi5wHuuO3BnH+JSK/ZgX+OmWR2eTDw=" X-RZG-CLASS-ID: mo00 Received: from lbhp.berneking.space by smtp.strato.de (RZmta 47.22.0 DYNA|AUTH) with ESMTPSA id R04274x2PIEHFdk (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Thu, 25 Mar 2021 19:14:17 +0100 (CET) From: Luca Berneking To: pve-devel@lists.proxmox.com Date: Thu, 25 Mar 2021 19:12:03 +0100 Message-Id: <20210325181203.1723609-2-luca@berneking.net> X-Mailer: git-send-email 2.31.0 In-Reply-To: <20210325181203.1723609-1-luca@berneking.net> References: <20210325181203.1723609-1-luca@berneking.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 DKIM_SIGNED 0.1 Message has a DKIM or DK signature, not necessarily valid DKIM_VALID -0.1 Message has at least one valid DKIM or DK signature DKIM_VALID_AU -0.1 Message has a valid DKIM or DK signature from author's domain DKIM_VALID_EF -0.1 Message has a valid DKIM or DK signature from envelope-from domain RCVD_IN_DNSWL_NONE -0.0001 Sender listed at https://www.dnswl.org/, no trust RCVD_IN_MSPIKE_H3 0.001 Good reputation (+3) RCVD_IN_MSPIKE_WL 0.001 Mailspike good senders SPF_HELO_PASS -0.001 SPF: HELO matches 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. [berneking.net, qemuserver.pm] Subject: [pve-devel] [PATCH qemu-server 1/1] pxe: Fix machine types with pxe 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: Thu, 25 Mar 2021 18:17:21 -0000 Fixes a problem with custom pxe roms. I need to boot a custom ipxe rom image in my pve vms. I simply replaced the rom file in `/usr/share/kvm/pxe-virtio.rom` with my custom rom build. But to actually load these rom images in a new vm, you need to use a machine type with a ".pxe" suffix. Theres the problem, proxmox adds "+pve0" to the machine type specified in the config, so "pc-i440fx-5.0+pve0.pxe" became "pc-i440fx-5.0+pve0.pxe+pve0" which obviously does not exists and failes to boot. Signed-off-by: Luca Berneking --- PVE/QemuServer.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index a498444..85b9fc8 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -2872,7 +2872,7 @@ sub get_vm_machine { } } - if ($add_pve_version && $machine !~ m/\+pve\d+$/) { + if ($add_pve_version && $machine !~ m/\+pve\d+(.pxe)?$/) { # for version-pinned machines that do not include a pve-version (e.g. # pc-q35-4.1), we assume 0 to keep them stable in case we bump $machine .= '+pve0'; -- 2.31.0