Repository navigation
Expand file tree
/
Copy path014-fix-machine-select.patch
More file actions
109 lines (103 loc) · 3.5 KB
/
Copy path014-fix-machine-select.patch
File metadata and controls
109 lines (103 loc) · 3.5 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
diff --git a/www/manager6/qemu/HardwareView.js b/www/manager6/qemu/HardwareView.js
index 2453fcf4..1d6a46fd 100644
--- a/www/manager6/qemu/HardwareView.js
+++ b/www/manager6/qemu/HardwareView.js
@@ -165,11 +165,6 @@ Ext.define('PVE.qemu.HardwareView', {
group: 6,
defaultValue: '',
renderer: function(value, metaData, record, rowIndex, colIndex, store, pending) {
- let ostype = me.getObjectValue('ostype', undefined, pending);
- if (PVE.Utils.is_windows(ostype) &&
- (!value || value === 'pc' || value === 'q35')) {
- return value === 'q35' ? 'pc-q35-5.1' : 'virt';
- }
return PVE.Utils.render_qemu_machine(value);
},
},
diff --git a/www/manager6/qemu/MachineEdit.js b/www/manager6/qemu/MachineEdit.js
index f8b3cb6a..d54ad01a 100644
--- a/www/manager6/qemu/MachineEdit.js
+++ b/www/manager6/qemu/MachineEdit.js
@@ -9,6 +9,8 @@ Ext.define('PVE.qemu.MachineInputPanel', {
},
formulas: {
q35: get => get('type') === 'q35',
+ pc: get => get('type') === 'pc',
+ virt: get => get('type') === 'virt',
},
},
@@ -23,24 +25,16 @@ Ext.define('PVE.qemu.MachineInputPanel', {
let me = this;
let version = me.lookup('version');
let store = version.getStore();
- let oldRec = store.findRecord('id', version.getValue(), 0, false, false, true);
- let type = value === 'q35' ? 'q35' : 'default';
- store.clearFilter();
- store.addFilter(val => val.data.id === 'latest' || val.data.type === type);
- if (!me.getView().isWindows) {
- version.setValue('latest');
- } else {
- store.isWindows = true;
- if (!oldRec) {
- return;
+ if (value === 'pc'){
+ value = 'i440fx';
}
- let oldVers = oldRec.data.version;
- // we already filtered by correct type, so just check version property
- let rec = store.findRecord('version', oldVers, 0, false, false, true);
- if (rec) {
- version.select(rec);
+ store.clearFilter();
+ console.log('value is '+ value)
+ if (value === null || value === '__default__') {
+ store.addFilter(val => val.data.id === 'latest');
+ }else{
+ store.addFilter(val => val.data.id === 'latest' || val.data.type === value);
}
- }
},
},
@@ -68,28 +62,15 @@ Ext.define('PVE.qemu.MachineInputPanel', {
let machineConf = PVE.Parser.parsePropertyString(values.machine, 'type');
values.machine = machineConf.type;
- me.isWindows = values.isWindows;
- if (values.machine === 'pc') {
- values.machine = '__default__';
- }
-
- if (me.isWindows) {
- if (values.machine === '__default__') {
- values.version = 'virt';
- } else if (values.machine === 'q35') {
- values.version = 'pc-q35-5.1';
- }
- }
-
values.viommu = machineConf.viommu || '__default__';
- if (values.machine !== '__default__' && values.machine !== 'q35') {
- values.version = values.machine;
- values.machine = values.version.match(/q35/) ? 'q35' : '__default__';
+ // if (values.machine !== '__default__' && values.machine !== 'q35') {
+ // values.version = values.machine;
+ // values.machine = values.version.match(/q35/) ? 'q35' : '__default__';
- // avoid hiding a pinned version
- me.setAdvancedVisible(true);
- }
+ // // avoid hiding a pinned version
+ // me.setAdvancedVisible(true);
+ // }
this.callParent(arguments);
},
@@ -131,9 +112,9 @@ Ext.define('PVE.qemu.MachineInputPanel', {
},
listeners: {
load: function(records) {
- if (!this.isWindows) {
+
this.insert(0, { id: 'latest', type: 'any', version: gettext('Latest') });
- }
+
},
},
},