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 | 18 ++++++++--------- www/manager6/qemu/QemuBiosEdit.js | 29 +++++++++++++++++++++++++-- www/manager6/qemu/SystemEdit.js | 3 +++ 3 files changed, 38 insertions(+), 12 deletions(-) diff --git a/www/manager6/form/QemuBiosSelector.js b/www/manager6/form/QemuBiosSelector.js index 5fa443f1..40abb589 100644 --- a/www/manager6/form/QemuBiosSelector.js +++ b/www/manager6/form/QemuBiosSelector.js @@ -1,16 +1,14 @@ Ext.define('PVE.form.QemuBiosSelector', { - extend: 'Proxmox.form.KVComboBox', + extend: 'PVE.form.FilteredKVComboBox', alias: ['widget.pveQemuBiosSelector'], - initComponent: function () { - var me = this; + comboItems: [ + ['__default__', PVE.Utils.render_qemu_bios('')], + ['seabios', PVE.Utils.render_qemu_bios('seabios')], + ['ovmf', PVE.Utils.render_qemu_bios('ovmf')], + ], - me.comboItems = [ - ['__default__', PVE.Utils.render_qemu_bios('')], - ['seabios', PVE.Utils.render_qemu_bios('seabios')], - ['ovmf', PVE.Utils.render_qemu_bios('ovmf')], - ]; + allowedValuesPerCategory: PVE.qemu.Architecture.allowedFirmware, - me.callParent(); - }, + setDefaultDisplay: (arch) => PVE.Utils.render_qemu_bios('', arch), }); diff --git a/www/manager6/qemu/QemuBiosEdit.js b/www/manager6/qemu/QemuBiosEdit.js index ef8f1844..76e5cfb1 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}', + category: '{arch}', + }, fieldLabel: 'BIOS', }, { @@ -42,4 +44,27 @@ 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; + let arch = PVE.qemu.Architecture.getNodeArchitecture(values.arch, me.nodename); + me.setValues(values); + me.down('pveQemuBiosSelector').setCategory(arch); + }, + }); + } + }, }); diff --git a/www/manager6/qemu/SystemEdit.js b/www/manager6/qemu/SystemEdit.js index 8bc92bd9..0c1e03ca 100644 --- a/www/manager6/qemu/SystemEdit.js +++ b/www/manager6/qemu/SystemEdit.js @@ -102,6 +102,9 @@ Ext.define('PVE.qemu.SystemInputPanel', { reference: 'bios', value: '__default__', fieldLabel: 'BIOS', + bind: { + category: '{current.architecture}', + }, }, { xtype: 'proxmoxcheckbox', -- 2.47.3
