Signed-off-by: Fabian Ebner <f.eb...@proxmox.com>
---
 PVE/API2/Capabilities.pm              | 6 ++++++
 PVE/API2/Nodes.pm                     | 7 -------
 www/manager6/form/CPUModelSelector.js | 2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/PVE/API2/Capabilities.pm b/PVE/API2/Capabilities.pm
index d7e99b55..c88c6c46 100644
--- a/PVE/API2/Capabilities.pm
+++ b/PVE/API2/Capabilities.pm
@@ -10,6 +10,11 @@ use PVE::API2::Qemu::Machine;
 
 use base qw(PVE::RESTHandler);
 
+__PACKAGE__->register_method ({
+    subclass => "PVE::API2::Qemu::CPU",
+    path => 'qemu/cpu',
+});
+
 __PACKAGE__->register_method ({
     subclass => "PVE::API2::Qemu::Machine",
     path => 'qemu/machines',
@@ -72,6 +77,7 @@ __PACKAGE__->register_method ({
        my ($param) = @_;
 
        my $result = [
+           { name => 'cpu' },
            { name => 'machines' },
        ];
 
diff --git a/PVE/API2/Nodes.pm b/PVE/API2/Nodes.pm
index 369c911c..f4d3382c 100644
--- a/PVE/API2/Nodes.pm
+++ b/PVE/API2/Nodes.pm
@@ -70,12 +70,6 @@ __PACKAGE__->register_method ({
     path => 'qemu',
 });
 
-# FIXME: move into capabilities/qemu
-__PACKAGE__->register_method ({
-    subclass => "PVE::API2::Qemu::CPU",
-    path => 'cpu',
-});
-
 __PACKAGE__->register_method ({
     subclass => "PVE::API2::LXC",
     path => 'lxc',
@@ -228,7 +222,6 @@ __PACKAGE__->register_method ({
            { name => 'ceph' },
            { name => 'certificates' },
            { name => 'config' },
-           { name => 'cpu' },
            { name => 'disks' },
            { name => 'dns' },
            { name => 'firewall' },
diff --git a/www/manager6/form/CPUModelSelector.js 
b/www/manager6/form/CPUModelSelector.js
index 225cdaa1..a30dd1fb 100644
--- a/www/manager6/form/CPUModelSelector.js
+++ b/www/manager6/form/CPUModelSelector.js
@@ -50,7 +50,7 @@ Ext.define('PVE.form.CPUModelSelector', {
        model: 'PVE.data.CPUModel',
        proxy: {
            type: 'proxmox',
-           url: '/api2/json/nodes/localhost/cpu',
+           url: '/api2/json/nodes/localhost/capabilities/qemu/cpu',
        },
        sorters: [
            {
-- 
2.30.2



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

Reply via email to