From: Thomas Lamprecht <t.lamprecht@proxmox.com>
To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>,
Stefan Reiter <s.reiter@proxmox.com>
Subject: [pve-devel] applied: [PATCH qemu-server] cfg2cmd: fix +pveN machine types with pxe
Date: Sun, 18 Apr 2021 17:59:33 +0200 [thread overview]
Message-ID: <f76456c8-2d9b-d714-6fe3-a0626a1f3b84@proxmox.com> (raw)
In-Reply-To: <20210331143923.29006-1-s.reiter@proxmox.com>
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!
prev parent reply other threads:[~2021-04-18 16:00 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-31 14:39 [pve-devel] " Stefan Reiter
2021-04-02 18:56 ` Luca Berneking
2021-04-18 15:59 ` Thomas Lamprecht [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f76456c8-2d9b-d714-6fe3-a0626a1f3b84@proxmox.com \
--to=t.lamprecht@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
--cc=s.reiter@proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox