Commit 9cf6d99b authored by Dietmar Maurer's avatar Dietmar Maurer

add scsihw option to GUI

parent c8abee0d
...@@ -2,6 +2,10 @@ pve-manager (2.1-15) unstable; urgency=low ...@@ -2,6 +2,10 @@ pve-manager (2.1-15) unstable; urgency=low
* Slovenian translation (thanks to Dojan Borstnar) * Slovenian translation (thanks to Dojan Borstnar)
* new option to select SCSI controller hardware
* add SATA to GUI
-- Proxmox Support Team <support@proxmox.com> Wed, 29 Aug 2012 07:15:54 +0200 -- Proxmox Support Team <support@proxmox.com> Wed, 29 Aug 2012 07:15:54 +0200
pve-manager (2.1-14) unstable; urgency=low pve-manager (2.1-14) unstable; urgency=low
......
...@@ -48,6 +48,7 @@ JSSRC= \ ...@@ -48,6 +48,7 @@ JSSRC= \
form/ContentTypeSelector.js \ form/ContentTypeSelector.js \
form/DayOfWeekSelector.js \ form/DayOfWeekSelector.js \
form/BackupModeSelector.js \ form/BackupModeSelector.js \
form/ScsiHwSelector.js \
dc/Tasks.js \ dc/Tasks.js \
dc/Log.js \ dc/Log.js \
panel/StatusPanel.js \ panel/StatusPanel.js \
...@@ -97,6 +98,7 @@ JSSRC= \ ...@@ -97,6 +98,7 @@ JSSRC= \
qemu/KeyboardEdit.js \ qemu/KeyboardEdit.js \
qemu/HardwareView.js \ qemu/HardwareView.js \
qemu/StartupEdit.js \ qemu/StartupEdit.js \
qemu/ScsiHwEdit.js \
qemu/Options.js \ qemu/Options.js \
qemu/Config.js \ qemu/Config.js \
qemu/CreateWizard.js \ qemu/CreateWizard.js \
......
...@@ -128,6 +128,20 @@ Ext.define('PVE.Utils', { statics: { ...@@ -128,6 +128,20 @@ Ext.define('PVE.Utils', { statics: {
return value; return value;
}, },
render_scsihw: function(value) {
if (!value) {
return PVE.Utils.defaultText + ' (lsi)';
} else if (value === 'lsi') {
return 'LSI 53C895A';
} else if (value === 'megasas') {
return 'MegaRAID SAS 8708EM2';
} else if (value === 'virtio-scsi-pci') {
return 'VIRTIO';
} else {
return value;
}
},
// fixme: auto-generate this // fixme: auto-generate this
// for now, please keep in sync with PVE::Tools::kvmkeymaps // for now, please keep in sync with PVE::Tools::kvmkeymaps
kvm_keymaps: { kvm_keymaps: {
......
Ext.define('PVE.form.ScsiHwSelector', {
extend: 'PVE.form.KVComboBox',
alias: ['widget.pveScsiHwSelector'],
initComponent: function() {
var me = this;
me.data = [
['', PVE.Utils.render_scsihw('')],
['lsi', PVE.Utils.render_scsihw('lsi')],
['megasas', PVE.Utils.render_scsihw('megasas')],
['virtio-scsi-pci', PVE.Utils.render_scsihw('virtio-scsi-pci')],
];
me.callParent();
}
});
...@@ -121,6 +121,12 @@ Ext.define('PVE.qemu.Options', { ...@@ -121,6 +121,12 @@ Ext.define('PVE.qemu.Options', {
} }
} : undefined } : undefined
}, },
scsihw: {
header: 'SCSI Controller Type',
editor: caps.vms['VM.Config.Options'] ? 'PVE.qemu.ScsiHwEdit' : undefined,
renderer: PVE.Utils.render_scsihw,
defaultValue: ''
},
kvm: { kvm: {
header: 'KVM hardware virtualization', header: 'KVM hardware virtualization',
defaultValue: true, defaultValue: true,
......
Ext.define('PVE.qemu.ScsiHwEdit', {
extend: 'PVE.window.Edit',
initComponent : function() {
var me = this;
Ext.applyIf(me, {
subject: gettext('SCSI Controller Type'),
items: {
xtype: 'pveScsiHwSelector',
name: 'scsihw',
value: '',
fieldLabel: gettext('Type')
}
});
me.callParent();
me.load();
}
});
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment