[pve-devel] applied: [PATCH qemu-server] cfg2cmd: fix +pveN machine types with pxe

[Thomas Lamprecht]

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 at berneking.net>
> Signed-off-by: Stefan Reiter <s.reiter at 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!