From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <pve-devel-bounces@lists.proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9])
by lore.proxmox.com (Postfix) with ESMTPS id B8D5F1FF189
for <inbox@lore.proxmox.com>; Fri, 4 Apr 2025 14:54:11 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 979CA1F55B;
Fri, 4 Apr 2025 14:53:50 +0200 (CEST)
From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Fri, 4 Apr 2025 14:53:43 +0200
Message-Id: <20250404125345.3244659-8-d.csapak@proxmox.com>
X-Mailer: git-send-email 2.39.5
In-Reply-To: <20250404125345.3244659-1-d.csapak@proxmox.com>
References: <20250404125345.3244659-1-d.csapak@proxmox.com>
MIME-Version: 1.0
X-SPAM-LEVEL: Spam detection results: 0
AWL -0.978 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
KAM_MAILER 2 Automated Mailer Tag Left in Email
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] [PATCH qemu-server v3 7/8] api: qemu machine
capabilities: add custom pveX versions too
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>
Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: pve-devel-bounces@lists.proxmox.com
Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com>
Add the pveX variants (where X > 0) to the list too, so one knows they
exits. Also this allows them to be shown and chosen in the UI.
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
Reviewed-by: Fiona Ebner <f.ebner@proxmox.com>
---
changes from v2:
* changed outer variable name to 'supported_machine_list'
PVE/API2/Qemu/Machine.pm | 28 +++++++++++++++++++++++++---
1 file changed, 25 insertions(+), 3 deletions(-)
diff --git a/PVE/API2/Qemu/Machine.pm b/PVE/API2/Qemu/Machine.pm
index afb535c2..bbd814f0 100644
--- a/PVE/API2/Qemu/Machine.pm
+++ b/PVE/API2/Qemu/Machine.pm
@@ -6,6 +6,7 @@ use warnings;
use JSON;
use PVE::JSONSchema qw(get_standard_option);
+use PVE::QemuServer::Machine;
use PVE::RESTHandler;
use PVE::Tools qw(file_get_contents);
@@ -49,12 +50,33 @@ __PACKAGE__->register_method({
},
},
code => sub {
- my $machines = eval {
+ my $supported_machine_list = eval {
my $raw = file_get_contents('/usr/share/kvm/machine-versions-x86_64.json');
- return from_json($raw, { utf8 => 1 });
+ my $machines = from_json($raw, { utf8 => 1 });
+
+ my $to_add = [];
+
+ for my $machine ($machines->@*) {
+ my $base_version = $machine->{version};
+ my $pvever = PVE::QemuServer::Machine::get_pve_version($base_version);
+ for (my $i = 1; $i <= $pvever; $i++) {
+ my $version = $base_version . "+pve$i";
+ my $entry = {
+ id => $machine->{id} . "+pve$i",
+ type => $machine->{type},
+ version => $version,
+ };
+
+ push $to_add->@*, $entry;
+ }
+ }
+
+ push $machines->@*, $to_add->@*;
+
+ return [sort { $b->{id} cmp $a->{id} } $machines->@*];
};
die "could not load supported machine versions - $@\n" if $@;
- return $machines;
+ return $supported_machine_list;
}
});
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel