since not all firmware variants are available/supported on every architecture, limit the selector to variants that make sense (e.g. to 'ovmf' on aarch64).
Same mechanism like the scsi hw selector. Signed-off-by: Dominik Csapak <[email protected]> --- www/manager6/form/QemuBiosSelector.js | 61 ++++++++++++++++++++++++--- www/manager6/qemu/QemuBiosEdit.js | 35 ++++++++++++++- www/manager6/qemu/SystemEdit.js | 5 +++ 3 files changed, 93 insertions(+), 8 deletions(-) diff --git a/www/manager6/form/QemuBiosSelector.js b/www/manager6/form/QemuBiosSelector.js index 5fa443f1..2b8231dc 100644 --- a/www/manager6/form/QemuBiosSelector.js +++ b/www/manager6/form/QemuBiosSelector.js @@ -2,15 +2,64 @@ Ext.define('PVE.form.QemuBiosSelector', { extend: 'Proxmox.form.KVComboBox', alias: ['widget.pveQemuBiosSelector'], + comboItems: [ + ['__default__', PVE.Utils.render_qemu_bios('')], + ['seabios', PVE.Utils.render_qemu_bios('seabios')], + ['ovmf', PVE.Utils.render_qemu_bios('ovmf')], + ], + + firmwarePerArchitecture: { + x86_64: ['__default__', 'seabios', 'ovmf'], // default is seabios + aarch64: ['ovmf'], + }, + + // defaults to hostArch + arch: undefined, + + // depends on the node + hostArch: 'x86_64', + + nodename: undefined, + + setNodename: function (nodename) { + let me = this; + let node = PVE.data.ResourceStore.getNodeById(nodename); + if (node) { + me.hostArch = node.data.architecture; + me.setArch(me.arch); // recalculate the filter + } + }, + + setArch: function (arch) { + let me = this; + if (arch === '__default__') { + arch = undefined; + } + me.arch = arch; + arch ??= me.hostArch; + let wasValid = me.isValid(); + me.store.clearFilter(); + let allowedFirmware = me.firmwarePerArchitecture[arch]; + me.store.addFilter((rec) => allowedFirmware.indexOf(rec.data.key) !== -1); + let isValid = me.isValid(); + // update default value with new arch + let record = me.store.findRecord('key', '__default__'); + if (record) { + record.set('value', PVE.Utils.render_qemu_bios('', arch)); + record.commit(); + } + + // for some reason, adding/changing filters does not trigger this, even though + // it show the field as invalid, so simply track and fire the event manually. + if (wasValid !== isValid) { + me.fireEvent('validitychange', isValid); + } + }, + initComponent: function () { var me = this; - me.comboItems = [ - ['__default__', PVE.Utils.render_qemu_bios('')], - ['seabios', PVE.Utils.render_qemu_bios('seabios')], - ['ovmf', PVE.Utils.render_qemu_bios('ovmf')], - ]; - me.callParent(); + me.setArch(me.arch); }, }); diff --git a/www/manager6/qemu/QemuBiosEdit.js b/www/manager6/qemu/QemuBiosEdit.js index ef8f1844..9fd98ab8 100644 --- a/www/manager6/qemu/QemuBiosEdit.js +++ b/www/manager6/qemu/QemuBiosEdit.js @@ -4,7 +4,6 @@ Ext.define('PVE.qemu.BiosEdit', { onlineHelp: 'qm_bios_and_uefi', subject: 'BIOS', - autoLoad: true, viewModel: { data: { @@ -22,7 +21,10 @@ Ext.define('PVE.qemu.BiosEdit', { onlineHelp: 'qm_bios_and_uefi', name: 'bios', value: '__default__', - bind: '{bios}', + bind: { + value: '{bios}', + arch: '{arch}', + }, fieldLabel: 'BIOS', }, { @@ -31,6 +33,13 @@ Ext.define('PVE.qemu.BiosEdit', { bind: '{efidisk0}', hidden: true, }, + { + xtype: 'hiddenfield', + name: 'arch', + hidden: true, + bind: '{arch}', + submitValue: false, + }, { xtype: 'displayfield', userCls: 'pmx-hint', @@ -42,4 +51,26 @@ Ext.define('PVE.qemu.BiosEdit', { }, }, ], + + initComponent: function () { + let me = this; + + me.nodename = me.pveSelNode?.data.node; + + if (!me.nodename) { + throw 'no nodename given'; + } + + me.callParent(); + + if (!me.isCreate) { + me.load({ + success: function ({ result }) { + let values = result.data; + values.arch = PVE.Utils.getArchitecture(values.arch, me.nodename); + me.setValues(values); + }, + }); + } + }, }); diff --git a/www/manager6/qemu/SystemEdit.js b/www/manager6/qemu/SystemEdit.js index 71fd1125..4b72b274 100644 --- a/www/manager6/qemu/SystemEdit.js +++ b/www/manager6/qemu/SystemEdit.js @@ -103,6 +103,11 @@ Ext.define('PVE.qemu.SystemInputPanel', { reference: 'bios', value: '__default__', fieldLabel: 'BIOS', + bind: { + arch: '{current.architecture}', + nodename: '{nodename}', + value: '{selectedBios}', + }, }, { xtype: 'proxmoxcheckbox', -- 2.47.3 _______________________________________________ pve-devel mailing list [email protected] https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
