From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <t.lamprecht@proxmox.com> 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 B5CCA74413 for <pve-devel@lists.proxmox.com>; Sun, 18 Apr 2021 18:00:08 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id AA6E1CC74 for <pve-devel@lists.proxmox.com>; Sun, 18 Apr 2021 17:59:38 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 id 040A1CC67 for <pve-devel@lists.proxmox.com>; Sun, 18 Apr 2021 17:59:35 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id C0F4142DD3 for <pve-devel@lists.proxmox.com>; Sun, 18 Apr 2021 17:59:34 +0200 (CEST) Message-ID: <f76456c8-2d9b-d714-6fe3-a0626a1f3b84@proxmox.com> Date: Sun, 18 Apr 2021 17:59:33 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:88.0) Gecko/20100101 Thunderbird/88.0 Content-Language: en-US To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>, Stefan Reiter <s.reiter@proxmox.com> References: <20210331143923.29006-1-s.reiter@proxmox.com> From: Thomas Lamprecht <t.lamprecht@proxmox.com> In-Reply-To: <20210331143923.29006-1-s.reiter@proxmox.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.040 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust 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] applied: [PATCH qemu-server] cfg2cmd: fix +pveN 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 <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> X-List-Received-Date: Sun, 18 Apr 2021 16:00:08 -0000 On 31.03.21 16:39, Stefan Reiter wrote: > Pinned machine versions like "pc-i440fx-4.2+pve2.pxe" would otherwise > get a second "+pve0" suffix, which is incorrect. > > Also deal with non-pve pinned versions correctly, i.e. > "pc-i440fx-5.2.pxe" becomes "pc-i440fx-5.2+pve0.pxe". > > Handle .pxe suffixes in Machine.pm as well, and add two test cases. > > Co-developed-by: Luca Berneking <luca@berneking.net> > Signed-off-by: Stefan Reiter <s.reiter@proxmox.com> > --- > > @Luca: First off, thanks for the contribution! I wanted to take a closer look at > your patch and ended up with this diff - I thought I'd just send it out and add > you as Co-dev, I hope that's fine with you. If you give this patch a shot, let > me know if it does indeed fix your issue correctly as well - "Tested-by:" is > always appreciated! > > Also, if you haven't already done so, to submit patches you need to send us a > signed contributor license agreement, see our developer documentation for more: > https://pve.proxmox.com/wiki/Developer_Documentation#Software_License_and_Copyright > - since this one doesn't actually include the changes you posted verbatim, I've > signed off on it myself, so it shouldn't be required, but for the future :) > > PVE/QemuServer.pm | 7 ++++- > PVE/QemuServer/Machine.pm | 6 ++-- > test/cfg2cmd/pinned-version-pxe-pve.conf | 17 ++++++++++ > test/cfg2cmd/pinned-version-pxe-pve.conf.cmd | 33 ++++++++++++++++++++ > test/cfg2cmd/pinned-version-pxe.conf | 15 +++++++++ > test/cfg2cmd/pinned-version-pxe.conf.cmd | 31 ++++++++++++++++++ > 6 files changed, 106 insertions(+), 3 deletions(-) > create mode 100644 test/cfg2cmd/pinned-version-pxe-pve.conf > create mode 100644 test/cfg2cmd/pinned-version-pxe-pve.conf.cmd > create mode 100644 test/cfg2cmd/pinned-version-pxe.conf > create mode 100644 test/cfg2cmd/pinned-version-pxe.conf.cmd > > applied, thanks to both of you!