Move bus priority list to OSDefaults

So a field container does not need to know if Linux likes SCSI.

diff --git a/www/manager6/form/ControllerSelector.js b/www/manager6/form/ControllerSelector.js
index 6482fed881f0e4f5a0395b739b7f6514cb4c8aa4..b5c71d905f29fcda544cc738cf0ed9e995c640d1 100644 (file)
--- a/www/manager6/form/ControllerSelector.js
+++ b/www/manager6/form/ControllerSelector.js
@@ -39,10 +39,10 @@ Ext.define('PVE.form.ControllerSelector', {
            }
        }
 
-       // TODO: add to OSDefaults.js?
-       var sortPriority = (vmconfig.ostype && vmconfig.ostype == "l26") ?
-           { scsi: 4 , virtio: 3, sata: 2, ide: 1 } :
-           { ide: 4, sata: 3, scsi: 2, virtio: 1 };
+       var vmDefaults = PVE.qemu.OSDefaults[vmconfig.ostype];
+
+       var sortPriority = vmDefaults && vmDefaults.busPriority
+           ? vmDefaults.busPriority : PVE.qemu.OSDefaults.generic;
 
        var sortedList = Ext.clone(controllerList);
        sortedList.sort(function(a,b) {

diff --git a/www/manager6/qemu/OSDefaults.js b/www/manager6/qemu/OSDefaults.js
index 1b114ce883cc41cee9acbbcad44cf174dda59517..f2fc8f4e373e7456f621f33741f530023aa0dc52 100644 (file)
--- a/www/manager6/qemu/OSDefaults.js
+++ b/www/manager6/qemu/OSDefaults.js
@@ -37,6 +37,12 @@ Ext.define('PVE.qemu.OSDefaults', {
        me.generic = {
            busType: 'ide',
            networkCard: 'e1000',
+           busPriority: {
+                   ide: 4,
+                   sata: 3,
+                   scsi: 2,
+                   virtio: 1
+           },
            scsihw: 'virtio-scsi-pci'
        };
 
@@ -46,6 +52,12 @@ Ext.define('PVE.qemu.OSDefaults', {
            pveOS: 'l26',
            parent : 'generic',
            busType: 'scsi',
+           busPriority: {
+                   scsi: 4,
+                   virtio: 3,
+                   sata: 2,
+                   ide: 1
+           },
            networkCard: 'virtio'
        });