Different architectures may have different controller priorities, so this has to use the architecture specific defaults.
For this, we have to pass through the nodename sometimes (to get the host architecture). The other notable change is that in the multi hd edit panel, we now only add the first disk in the 'afterrender' event. This is done so that we guaranteed have a nodename, which is not the case when called in 'init'. (The 'bind' mechanism we use in the wizard changes that only after the 'init' functions are called.) Signed-off-by: Dominik Csapak <[email protected]> --- www/manager6/Utils.js | 9 ++++----- www/manager6/form/ControllerSelector.js | 9 ++++++++- www/manager6/panel/MultiDiskEdit.js | 14 ++++++++------ www/manager6/qemu/CIDriveEdit.js | 2 ++ www/manager6/qemu/MultiHDEdit.js | 3 ++- www/manager6/qemu/NetworkEdit.js | 3 ++- www/manager6/window/GuestDiskReassign.js | 1 + 7 files changed, 27 insertions(+), 14 deletions(-) diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js index 613a7113..975a0aec 100644 --- a/www/manager6/Utils.js +++ b/www/manager6/Utils.js @@ -1951,10 +1951,8 @@ Ext.define('PVE.Utils', { return true; }, - sortByPreviousUsage: function (vmconfig, controllerList) { - if (!controllerList) { - controllerList = ['ide', 'virtio', 'scsi', 'sata']; - } + sortByPreviousUsage: function (vmconfig, nodename) { + let controllerList = ['ide', 'virtio', 'scsi', 'sata']; let usedControllers = {}; for (const type of Object.keys(PVE.Utils.diskControllerMaxIDs)) { usedControllers[type] = 0; @@ -1970,7 +1968,8 @@ Ext.define('PVE.Utils', { } } - let sortPriority = PVE.qemu.OSDefaults.getDefaults(vmconfig.ostype).busPriority; + let arch = PVE.Utils.getArchitecture(vmconfig.arch, nodename); + let sortPriority = PVE.qemu.OSDefaults.getDefaults(vmconfig.ostype, arch).busPriority; let sortedList = Ext.clone(controllerList); sortedList.sort(function (a, b) { diff --git a/www/manager6/form/ControllerSelector.js b/www/manager6/form/ControllerSelector.js index bcc8334d..fee2b398 100644 --- a/www/manager6/form/ControllerSelector.js +++ b/www/manager6/form/ControllerSelector.js @@ -7,6 +7,13 @@ Ext.define('PVE.form.ControllerSelector', { vmconfig: {}, // used to check for existing devices + nodename: undefined, + + setNodename: function (nodename) { + let me = this; + me.nodename = nodename; + }, + setToFree: function (controllers, busField, deviceIDField) { let me = this; let freeId = PVE.Utils.nextFreeDisk(controllers, me.vmconfig); @@ -42,7 +49,7 @@ Ext.define('PVE.form.ControllerSelector', { clist = ['ide', 'scsi', 'sata']; } else { // in most cases we want to add a disk to the same controller we previously used - clist = PVE.Utils.sortByPreviousUsage(me.vmconfig); + clist = PVE.Utils.sortByPreviousUsage(me.vmconfig, me.nodename); } me.setToFree(clist, bussel, deviceid); diff --git a/www/manager6/panel/MultiDiskEdit.js b/www/manager6/panel/MultiDiskEdit.js index 32fad5dc..e96a5f96 100644 --- a/www/manager6/panel/MultiDiskEdit.js +++ b/www/manager6/panel/MultiDiskEdit.js @@ -5,6 +5,7 @@ Ext.define('PVE.panel.MultiDiskPanel', { setNodename: function (nodename) { this.items.each((panel) => panel.setNodename(nodename)); + this.nodename = nodename; }, border: false, @@ -210,12 +211,13 @@ Ext.define('PVE.panel.MultiDiskPanel', { 'grid[reference=grid]': { selectionchange: 'onSelectionChange', }, - }, - - init: function (view) { - let me = this; - me.onAdd(); - me.lookup('grid').getSelectionModel().select(0, false); + '#': { + afterrender: function (view) { + let me = this; + me.onAdd(); + me.lookup('grid').getSelectionModel().select(0, false); + }, + }, }, }, diff --git a/www/manager6/qemu/CIDriveEdit.js b/www/manager6/qemu/CIDriveEdit.js index 14e6d368..aefbbfab 100644 --- a/www/manager6/qemu/CIDriveEdit.js +++ b/www/manager6/qemu/CIDriveEdit.js @@ -20,6 +20,7 @@ Ext.define('PVE.qemu.CIDriveInputPanel', { setNodename: function (nodename) { var me = this; me.down('#hdstorage').setNodename(nodename); + me.down('#drive').setNodename(nodename); me.down('#hdimage').setStorage(undefined, nodename); }, @@ -39,6 +40,7 @@ Ext.define('PVE.qemu.CIDriveInputPanel', { withVirtIO: false, itemId: 'drive', fieldLabel: gettext('CloudInit Drive'), + nodename: me.nodename, name: 'drive', }, { diff --git a/www/manager6/qemu/MultiHDEdit.js b/www/manager6/qemu/MultiHDEdit.js index 0b048709..220167de 100644 --- a/www/manager6/qemu/MultiHDEdit.js +++ b/www/manager6/qemu/MultiHDEdit.js @@ -17,7 +17,8 @@ Ext.define('PVE.qemu.MultiHDPanel', { ) - 1, getNextFreeDisk: function (vmconfig) { - let clist = PVE.Utils.sortByPreviousUsage(vmconfig); + let nodename = this.getView().nodename; + let clist = PVE.Utils.sortByPreviousUsage(vmconfig, nodename); return PVE.Utils.nextFreeDisk(clist, vmconfig); }, diff --git a/www/manager6/qemu/NetworkEdit.js b/www/manager6/qemu/NetworkEdit.js index 2ba13c40..7655864c 100644 --- a/www/manager6/qemu/NetworkEdit.js +++ b/www/manager6/qemu/NetworkEdit.js @@ -264,7 +264,8 @@ Ext.define('PVE.qemu.NetworkEdit', { } let ostype = me.vmconfig.ostype; - let defaults = PVE.qemu.OSDefaults.getDefaults(ostype); + let arch = PVE.Utils.getArchitecture(me.vmconfig.arch, me.nodename); + let defaults = PVE.qemu.OSDefaults.getDefaults(ostype, arch); let data = { model: defaults.networkCard, }; diff --git a/www/manager6/window/GuestDiskReassign.js b/www/manager6/window/GuestDiskReassign.js index 596808f8..af149010 100644 --- a/www/manager6/window/GuestDiskReassign.js +++ b/www/manager6/window/GuestDiskReassign.js @@ -171,6 +171,7 @@ Ext.define('PVE.window.GuestDiskReassign', { disabled: true, cbind: { hidden: '{!isQemu}', + nodename: '{nodename}', }, }, { -- 2.47.3 _______________________________________________ pve-devel mailing list [email protected] https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
