Repository navigation
Expand file tree
/
Copy path011-Add-x86_64-cpu-for-compatible-with-x86-host.patch
More file actions
278 lines (266 loc) · 9.82 KB
/
Copy path011-Add-x86_64-cpu-for-compatible-with-x86-host.patch
File metadata and controls
278 lines (266 loc) · 9.82 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
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
diff --git a/PVE/QemuServer/CPUConfig.pm b/PVE/QemuServer/CPUConfig.pm
index f5344716..df8ea459 100644
--- a/PVE/QemuServer/CPUConfig.pm
+++ b/PVE/QemuServer/CPUConfig.pm
@@ -39,22 +39,22 @@ sub load_custom_model_conf {
#builtin models : reported-model is mandatory
my $builtin_models = {
- # 'x86-64-v2' => {
- # 'reported-model' => 'qemu64',
- # flags => "+popcnt;+pni;+sse4.1;+sse4.2;+ssse3",
- # },
- # 'x86-64-v2-AES' => {
- # 'reported-model' => 'qemu64',
- # flags => "+aes;+popcnt;+pni;+sse4.1;+sse4.2;+ssse3",
- # },
- # 'x86-64-v3' => {
- # 'reported-model' => 'qemu64',
- # flags => "+aes;+popcnt;+pni;+sse4.1;+sse4.2;+ssse3;+avx;+avx2;+bmi1;+bmi2;+f16c;+fma;+abm;+movbe;+xsave",
- # },
- # 'x86-64-v4' => {
- # 'reported-model' => 'qemu64',
- # flags => "+aes;+popcnt;+pni;+sse4.1;+sse4.2;+ssse3;+avx;+avx2;+bmi1;+bmi2;+f16c;+fma;+abm;+movbe;+xsave;+avx512f;+avx512bw;+avx512cd;+avx512dq;+avx512vl",
- # },
+ 'x86-64-v2' => {
+ 'reported-model' => 'qemu64',
+ flags => "+popcnt;+pni;+sse4.1;+sse4.2;+ssse3",
+ },
+ 'x86-64-v2-AES' => {
+ 'reported-model' => 'qemu64',
+ flags => "+aes;+popcnt;+pni;+sse4.1;+sse4.2;+ssse3",
+ },
+ 'x86-64-v3' => {
+ 'reported-model' => 'qemu64',
+ flags => "+aes;+popcnt;+pni;+sse4.1;+sse4.2;+ssse3;+avx;+avx2;+bmi1;+bmi2;+f16c;+fma;+abm;+movbe;+xsave",
+ },
+ 'x86-64-v4' => {
+ 'reported-model' => 'qemu64',
+ flags => "+aes;+popcnt;+pni;+sse4.1;+sse4.2;+ssse3;+avx;+avx2;+bmi1;+bmi2;+f16c;+fma;+abm;+movbe;+xsave;+avx512f;+avx512bw;+avx512cd;+avx512dq;+avx512vl",
+ },
};
my $depreacated_cpu_map = {
@@ -76,99 +76,99 @@ my $cputypes_32bit = {
my $cpu_vendor_list = {
# Intel CPUs
- # 486 => 'GenuineIntel',
- # pentium => 'GenuineIntel',
- # pentium2 => 'GenuineIntel',
- # pentium3 => 'GenuineIntel',
- # coreduo => 'GenuineIntel',
- # core2duo => 'GenuineIntel',
- # Conroe => 'GenuineIntel',
- # Penryn => 'GenuineIntel',
- # Nehalem => 'GenuineIntel',
- # 'Nehalem-IBRS' => 'GenuineIntel',
- # Westmere => 'GenuineIntel',
- # 'Westmere-IBRS' => 'GenuineIntel',
- # SandyBridge => 'GenuineIntel',
- # 'SandyBridge-IBRS' => 'GenuineIntel',
- # IvyBridge => 'GenuineIntel',
- # 'IvyBridge-IBRS' => 'GenuineIntel',
- # Haswell => 'GenuineIntel',
- # 'Haswell-IBRS' => 'GenuineIntel',
- # 'Haswell-noTSX' => 'GenuineIntel',
- # 'Haswell-noTSX-IBRS' => 'GenuineIntel',
- # Broadwell => 'GenuineIntel',
- # 'Broadwell-IBRS' => 'GenuineIntel',
- # 'Broadwell-noTSX' => 'GenuineIntel',
- # 'Broadwell-noTSX-IBRS' => 'GenuineIntel',
- # 'Skylake-Client' => 'GenuineIntel',
- # 'Skylake-Client-IBRS' => 'GenuineIntel',
- # 'Skylake-Client-noTSX-IBRS' => 'GenuineIntel',
- # 'Skylake-Client-v4' => 'GenuineIntel',
- # 'Skylake-Server' => 'GenuineIntel',
- # 'Skylake-Server-IBRS' => 'GenuineIntel',
- # 'Skylake-Server-noTSX-IBRS' => 'GenuineIntel',
- # 'Skylake-Server-v4' => 'GenuineIntel',
- # 'Skylake-Server-v5' => 'GenuineIntel',
- # 'Cascadelake-Server' => 'GenuineIntel',
- # 'Cascadelake-Server-v2' => 'GenuineIntel',
- # 'Cascadelake-Server-noTSX' => 'GenuineIntel',
- # 'Cascadelake-Server-v4' => 'GenuineIntel',
- # 'Cascadelake-Server-v5' => 'GenuineIntel',
- # 'Cooperlake' => 'GenuineIntel',
- # 'Cooperlake-v2' => 'GenuineIntel',
- # KnightsMill => 'GenuineIntel',
- # 'Icelake-Client' => 'GenuineIntel', # depreacated, removed with QEMU 7.1
- # 'Icelake-Client-noTSX' => 'GenuineIntel', # depreacated, removed with QEMU 7.1
- # 'Icelake-Server' => 'GenuineIntel',
- # 'Icelake-Server-noTSX' => 'GenuineIntel',
- # 'Icelake-Server-v3' => 'GenuineIntel',
- # 'Icelake-Server-v4' => 'GenuineIntel',
- # 'Icelake-Server-v5' => 'GenuineIntel',
- # 'Icelake-Server-v6' => 'GenuineIntel',
- # 'SapphireRapids' => 'GenuineIntel',
-
- # # AMD CPUs
- # athlon => 'AuthenticAMD',
- # phenom => 'AuthenticAMD',
- # Opteron_G1 => 'AuthenticAMD',
- # Opteron_G2 => 'AuthenticAMD',
- # Opteron_G3 => 'AuthenticAMD',
- # Opteron_G4 => 'AuthenticAMD',
- # Opteron_G5 => 'AuthenticAMD',
- # EPYC => 'AuthenticAMD',
- # 'EPYC-IBPB' => 'AuthenticAMD',
- # 'EPYC-v3' => 'AuthenticAMD',
- #'EPYC-v4' => 'AuthenticAMD',
- # 'EPYC-Rome' => 'AuthenticAMD',
- # 'EPYC-Rome-v2' => 'AuthenticAMD',
- #'EPYC-Rome-v3' => 'AuthenticAMD',
- #'EPYC-Rome-v4' => 'AuthenticAMD',
- #'EPYC-Milan' => 'AuthenticAMD',
- #'EPYC-Milan-v2' => 'AuthenticAMD',
- #'EPYC-Genoa' => 'AuthenticAMD',
+ 486 => 'GenuineIntel',
+ pentium => 'GenuineIntel',
+ pentium2 => 'GenuineIntel',
+ pentium3 => 'GenuineIntel',
+ coreduo => 'GenuineIntel',
+ core2duo => 'GenuineIntel',
+ Conroe => 'GenuineIntel',
+ Penryn => 'GenuineIntel',
+ Nehalem => 'GenuineIntel',
+ 'Nehalem-IBRS' => 'GenuineIntel',
+ Westmere => 'GenuineIntel',
+ 'Westmere-IBRS' => 'GenuineIntel',
+ SandyBridge => 'GenuineIntel',
+ 'SandyBridge-IBRS' => 'GenuineIntel',
+ IvyBridge => 'GenuineIntel',
+ 'IvyBridge-IBRS' => 'GenuineIntel',
+ Haswell => 'GenuineIntel',
+ 'Haswell-IBRS' => 'GenuineIntel',
+ 'Haswell-noTSX' => 'GenuineIntel',
+ 'Haswell-noTSX-IBRS' => 'GenuineIntel',
+ Broadwell => 'GenuineIntel',
+ 'Broadwell-IBRS' => 'GenuineIntel',
+ 'Broadwell-noTSX' => 'GenuineIntel',
+ 'Broadwell-noTSX-IBRS' => 'GenuineIntel',
+ 'Skylake-Client' => 'GenuineIntel',
+ 'Skylake-Client-IBRS' => 'GenuineIntel',
+ 'Skylake-Client-noTSX-IBRS' => 'GenuineIntel',
+ 'Skylake-Client-v4' => 'GenuineIntel',
+ 'Skylake-Server' => 'GenuineIntel',
+ 'Skylake-Server-IBRS' => 'GenuineIntel',
+ 'Skylake-Server-noTSX-IBRS' => 'GenuineIntel',
+ 'Skylake-Server-v4' => 'GenuineIntel',
+ 'Skylake-Server-v5' => 'GenuineIntel',
+ 'Cascadelake-Server' => 'GenuineIntel',
+ 'Cascadelake-Server-v2' => 'GenuineIntel',
+ 'Cascadelake-Server-noTSX' => 'GenuineIntel',
+ 'Cascadelake-Server-v4' => 'GenuineIntel',
+ 'Cascadelake-Server-v5' => 'GenuineIntel',
+ 'Cooperlake' => 'GenuineIntel',
+ 'Cooperlake-v2' => 'GenuineIntel',
+ KnightsMill => 'GenuineIntel',
+ 'Icelake-Client' => 'GenuineIntel', # depreacated, removed with QEMU 7.1
+ 'Icelake-Client-noTSX' => 'GenuineIntel', # depreacated, removed with QEMU 7.1
+ 'Icelake-Server' => 'GenuineIntel',
+ 'Icelake-Server-noTSX' => 'GenuineIntel',
+ 'Icelake-Server-v3' => 'GenuineIntel',
+ 'Icelake-Server-v4' => 'GenuineIntel',
+ 'Icelake-Server-v5' => 'GenuineIntel',
+ 'Icelake-Server-v6' => 'GenuineIntel',
+ 'SapphireRapids' => 'GenuineIntel',
+
+ # AMD CPUs
+ athlon => 'AuthenticAMD',
+ phenom => 'AuthenticAMD',
+ Opteron_G1 => 'AuthenticAMD',
+ Opteron_G2 => 'AuthenticAMD',
+ Opteron_G3 => 'AuthenticAMD',
+ Opteron_G4 => 'AuthenticAMD',
+ Opteron_G5 => 'AuthenticAMD',
+ EPYC => 'AuthenticAMD',
+ 'EPYC-IBPB' => 'AuthenticAMD',
+ 'EPYC-v3' => 'AuthenticAMD',
+ 'EPYC-v4' => 'AuthenticAMD',
+ 'EPYC-Rome' => 'AuthenticAMD',
+ 'EPYC-Rome-v2' => 'AuthenticAMD',
+ 'EPYC-Rome-v3' => 'AuthenticAMD',
+ 'EPYC-Rome-v4' => 'AuthenticAMD',
+ 'EPYC-Milan' => 'AuthenticAMD',
+ 'EPYC-Milan-v2' => 'AuthenticAMD',
+ 'EPYC-Genoa' => 'AuthenticAMD',
# # generic types, use vendor from host node
# host => 'default',
- # kvm32 => 'default',
- # kvm64 => 'default',
- # qemu32 => 'default',
- # qemu64 => 'default',
+ kvm32 => 'default',
+ kvm64 => 'default',
+ qemu32 => 'default',
+ qemu64 => 'default',
# max => 'default',
# virt arm64 cpus
'host' => 'default',
- 'cortex-a35' => 'default',
- 'cortex-a53' => 'default',
- 'cortex-a55' => 'default',
- 'cortex-a57' => 'default',
- 'cortex-a72' => 'default',
- 'cortex-a76' => 'default',
- 'neoverse-n1' => 'default',
+ 'cortex-a35' => 'ARM',
+ 'cortex-a53' => 'ARM',
+ 'cortex-a55' => 'ARM',
+ 'cortex-a57' => 'ARM',
+ 'cortex-a72' => 'ARM',
+ 'cortex-a76' => 'ARM',
+ 'neoverse-n1' => 'ARM',
'max' => 'default',
- 'la464_loongarch_cpu' => 'default',
- 'rv64' => 'default',
- 'la464' => 'default',
- 'la132' => 'default',
- 'Kunpeng-920' => 'default',
+ 'la464_loongarch_cpu' => 'LoongARCH',
+ 'rv64' => 'RISCV',
+ 'la464' => 'LoongARCH',
+ 'la132' => 'LoongARCH',
+ 'Kunpeng-920' => 'ARM',
};
my @supported_cpu_flags = (
@@ -635,15 +635,12 @@ sub get_cpu_options {
# $cputype is the "reported-model" for custom types, so we can just look up
# the vendor in the default list
- my $cpu_vendor = $cpu_vendor_list->{$cputype};
+ my $cpu_vendor = $cpu_vendor_list->{$cputype} if $arch eq 'x86_64';
if ($cpu_vendor) {
- $pve_forced_flags->{'vendor'} = {
- value => $cpu_vendor,
- } if $cpu_vendor ne 'default';
- } elsif ($arch ne 'loongarch64') {
- die "internal error"; # should not happen
- }
-
+ $pve_forced_flags->{'vendor'} = {
+ value => $cpu_vendor,
+ } if $cpu_vendor ne 'default';
+ }
my $cpu_str = $cputype;
# will be resolved in parameter order
@@ -781,6 +778,7 @@ sub get_default_cpu_type {
$cputype = 'host' if $arch eq 'arm';
$cputype = 'rv64' if $arch eq 'riscv64';
$cputype = 'max' if $arch eq 'loongarch64';
+ $cputype = 'host' if $arch eq 'x86_64';
return $cputype;
}
diff --git a/debian/changelog b/debian/changelog
index caf93620..7b1cf9c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
+qemu-server (8.3.3+port3) bookworm; urgency=medium
+
+ * Add x86_64 cpu for compatible with x86 host
+
+ -- Jiangcuo <Jiangcuo@lierfang.com> Fri, 17 Jan 2025 11:57:51 +0800
+
qemu-server (8.3.3+port2) bookworm; urgency=medium
* Add 'gicversion' param.
- -- Jiangcuo <Jiangcuo@lierfang.com> Thu, 26 Dec 2024 12:13:33 +0800
+ -- Jiangcuo <Jiangcuo@lierfang.com> Thu, 26 Dec 2024 12:14:33 +0800
qemu-server (8.3.3+port) bookworm; urgency=medium