api: add proxmox-firewall to versions pkg list

[pve-manager.git] / www / manager6 / qemu / MachineEdit.js

diff --git a/www/manager6/qemu/MachineEdit.js b/www/manager6/qemu/MachineEdit.js
index 87b405f50a89722071dca115e4f5864b85770261..a697cd344af4d36cec466704a4fef9214d245980 100644 (file)
--- a/www/manager6/qemu/MachineEdit.js
+++ b/www/manager6/qemu/MachineEdit.js
@@ -1,6 +1,16 @@
 Ext.define('PVE.qemu.MachineInputPanel', {
     extend: 'Proxmox.panel.InputPanel',
     xtype: 'pveMachineInputPanel',
+    onlineHelp: 'qm_machine_type',
+
+    viewModel: {
+       data: {
+           type: '__default__',
+       },
+       formulas: {
+           q35: get => get('type') === 'q35',
+       },
+    },
 
     controller: {
        xclass: 'Ext.app.ViewController',
@@ -35,17 +45,29 @@ Ext.define('PVE.qemu.MachineInputPanel', {
     },
 
     onGetValues: function(values) {
+       if (values.delete === 'machine' && values.viommu) {
+           delete values.delete;
+           values.machine = 'pc';
+       }
        if (values.version && values.version !== 'latest') {
            values.machine = values.version;
            delete values.delete;
        }
        delete values.version;
-       return values;
+       if (values.delete === 'machine' && !values.viommu) {
+           return values;
+       }
+       let ret = {};
+       ret.machine = PVE.Parser.printPropertyString(values, 'machine');
+       return ret;
     },
 
     setValues: function(values) {
        let me = this;
 
+       let machineConf = PVE.Parser.parsePropertyString(values.machine, 'type');
+       values.machine = machineConf.type;
+
        me.isWindows = values.isWindows;
        if (values.machine === 'pc') {
            values.machine = '__default__';
@@ -58,6 +80,9 @@ Ext.define('PVE.qemu.MachineInputPanel', {
                values.version = 'pc-q35-5.1';
            }
        }
+
+       values.viommu = machineConf.viommu || '__default__';
+
        if (values.machine !== '__default__' && values.machine !== 'q35') {
            values.version = values.machine;
            values.machine = values.version.match(/q35/) ? 'q35' : '__default__';
@@ -78,6 +103,9 @@ Ext.define('PVE.qemu.MachineInputPanel', {
            ['__default__', PVE.Utils.render_qemu_machine('')],
            ['q35', 'q35'],
        ],
+       bind: {
+           value: '{type}',
+       },
     },
 
     advancedItems: [
@@ -113,6 +141,39 @@ Ext.define('PVE.qemu.MachineInputPanel', {
            fieldLabel: gettext('Note'),
            value: gettext('Machine version change may affect hardware layout and settings in the guest OS.'),
        },
+       {
+           xtype: 'proxmoxKVComboBox',
+           name: 'viommu',
+           fieldLabel: gettext('vIOMMU'),
+           reference: 'viommu-q35',
+           deleteEmpty: false,
+           value: '__default__',
+           comboItems: [
+               ['__default__', Proxmox.Utils.defaultText + ' (None)'],
+               ['intel', gettext('Intel (AMD Compatible)')],
+               ['virtio', 'VirtIO'],
+           ],
+           bind: {
+               hidden: '{!q35}',
+               disabled: '{!q35}',
+           },
+       },
+       {
+           xtype: 'proxmoxKVComboBox',
+           name: 'viommu',
+           fieldLabel: gettext('vIOMMU'),
+           reference: 'viommu-i440fx',
+           deleteEmpty: false,
+           value: '__default__',
+           comboItems: [
+               ['__default__', Proxmox.Utils.defaultText + ' (None)'],
+               ['virtio', 'VirtIO'],
+           ],
+           bind: {
+               hidden: '{q35}',
+               disabled: '{q35}',
+           },
+       },
     ],
 });
 
@@ -138,9 +199,7 @@ Ext.define('PVE.qemu.MachineEdit', {
                let values = {
                    machine: conf.machine || '__default__',
                };
-               if (conf.ostype && conf.ostype.match(/^(win|wvista|wxp|w2k)/i)) {
-                   values.isWindows = true;
-               }
+               values.isWindows = PVE.Utils.is_windows(conf.ostype);
                me.setValues(values);
            },
        });