[pve-devel] [PATCH manager v3 2/8] Remove unused noScsi parameter

[Thomas Lamprecht]

On 09/26/2017 02:17 PM, Emmanuel Kasper wrote:
> SCSI is a valid bus for Disks and CD drives, so it should always
> be appear in the bus list.

Reviewed-by: Thomas Lamprecht <t.lamprecht at proxmox.com>

> ---
>   www/manager6/form/BusTypeSelector.js    | 6 +-----
>   www/manager6/form/ControllerSelector.js | 6 +-----
>   2 files changed, 2 insertions(+), 10 deletions(-)
> 
> diff --git a/www/manager6/form/BusTypeSelector.js b/www/manager6/form/BusTypeSelector.js
> index 9b9492fc..ae7c327e 100644
> --- a/www/manager6/form/BusTypeSelector.js
> +++ b/www/manager6/form/BusTypeSelector.js
> @@ -4,8 +4,6 @@ Ext.define('PVE.form.BusTypeSelector', {
>     
>       noVirtIO: false,
>   
> -    noScsi: false,
> -
>       initComponent: function() {
>   	var me = this;
>   
> @@ -15,9 +13,7 @@ Ext.define('PVE.form.BusTypeSelector', {
>   	    me.comboItems.push(['virtio', 'VirtIO']);
>   	}
>   
> -	if (!me.noScsi) {
> -	    me.comboItems.push(['scsi', 'SCSI']);
> -	}
> +	me.comboItems.push(['scsi', 'SCSI']);
>   
>   	me.callParent();
>       }
> diff --git a/www/manager6/form/ControllerSelector.js b/www/manager6/form/ControllerSelector.js
> index 045e7d0d..14ad574e 100644
> --- a/www/manager6/form/ControllerSelector.js
> +++ b/www/manager6/form/ControllerSelector.js
> @@ -13,8 +13,6 @@ Ext.define('PVE.form.ControllerSelector', {
>   
>       noVirtIO: false,
>   
> -    noScsi: false,
> -
>       vmconfig: {}, // used to check for existing devices
>   
>       sortByPreviousUsage: function(vmconfig, controllerList) {
> @@ -75,8 +73,7 @@ Ext.define('PVE.form.ControllerSelector', {
>   
>   	Ext.Array.each(clist, function(controller) {
>   	    var confid, i;
> -	    if ((controller === 'virtio' && me.noVirtIO) ||
> -		    (controller === 'scsi' && me.noScsi)) {
> +	    if (controller === 'virtio' && me.noVirtIO) {
>   		return; //continue
>   	    }
>   	    me.down('field[name=controller]').setValue(controller);
> @@ -106,7 +103,6 @@ Ext.define('PVE.form.ControllerSelector', {
>   		    name: 'controller',
>   		    value: PVE.qemu.OSDefaults.generic.busType,
>   		    noVirtIO: me.noVirtIO,
> -		    noScsi: me.noScsi,
>   		    allowBlank: false,
>   		    flex: 2,
>   		    listeners: {
>