Browse Source

Merge "Indent fake libvirt host capabilities fixtures more nicely"

changes/85/472285/6
Zuul 1 week ago
parent
commit
f4ca3e7085
1 changed files with 318 additions and 318 deletions
  1. 318
    318
      nova/tests/unit/virt/libvirt/fake_libvirt_data.py

+ 318
- 318
nova/tests/unit/virt/libvirt/fake_libvirt_data.py View File

@@ -215,330 +215,330 @@ CAPABILITIES_HOST_TEMPLATE = '''
215 215
 # other non-x86 architectures, so these test assertions on apply to
216 216
 # x86.
217 217
 CAPABILITIES_GUEST = {
218
-        'i686': '''
219
-  <guest>
220
-    <os_type>hvm</os_type>
221
-    <arch name='i686'>
222
-      <wordsize>32</wordsize>
223
-      <emulator>/usr/bin/qemu-system-i386</emulator>
224
-      <machine maxCpus='255'>pc-i440fx-2.11</machine>
225
-      <machine canonical='pc-i440fx-2.11' maxCpus='255'>pc</machine>
226
-      <machine maxCpus='1'>isapc</machine>
227
-      <machine maxCpus='255'>pc-1.1</machine>
228
-      <machine maxCpus='255'>pc-1.2</machine>
229
-      <machine maxCpus='255'>pc-1.3</machine>
230
-      <machine maxCpus='255'>pc-i440fx-2.8</machine>
231
-      <machine maxCpus='255'>pc-1.0</machine>
232
-      <machine maxCpus='255'>pc-i440fx-2.9</machine>
233
-      <machine maxCpus='255'>pc-i440fx-2.6</machine>
234
-      <machine maxCpus='255'>pc-i440fx-2.7</machine>
235
-      <machine maxCpus='128'>xenfv</machine>
236
-      <machine maxCpus='255'>pc-i440fx-2.3</machine>
237
-      <machine maxCpus='255'>pc-i440fx-2.4</machine>
238
-      <machine maxCpus='255'>pc-i440fx-2.5</machine>
239
-      <machine maxCpus='255'>pc-i440fx-2.1</machine>
240
-      <machine maxCpus='255'>pc-i440fx-2.2</machine>
241
-      <machine maxCpus='255'>pc-i440fx-2.0</machine>
242
-      <machine maxCpus='288'>pc-q35-2.11</machine>
243
-      <machine maxCpus='288'>q35</machine>
244
-      <machine maxCpus='1'>xenpv</machine>
245
-      <machine maxCpus='288'>pc-q35-2.10</machine>
246
-      <machine maxCpus='255'>pc-i440fx-1.7</machine>
247
-      <machine maxCpus='288'>pc-q35-2.9</machine>
248
-      <machine maxCpus='255'>pc-0.15</machine>
249
-      <machine maxCpus='255'>pc-i440fx-1.5</machine>
250
-      <machine maxCpus='255'>pc-q35-2.7</machine>
251
-      <machine maxCpus='255'>pc-i440fx-1.6</machine>
252
-      <machine maxCpus='288'>pc-q35-2.8</machine>
253
-      <machine maxCpus='255'>pc-0.13</machine>
254
-      <machine maxCpus='255'>pc-0.14</machine>
255
-      <machine maxCpus='255'>pc-q35-2.4</machine>
256
-      <machine maxCpus='255'>pc-q35-2.5</machine>
257
-      <machine maxCpus='255'>pc-q35-2.6</machine>
258
-      <machine maxCpus='255'>pc-i440fx-1.4</machine>
259
-      <machine maxCpus='255'>pc-i440fx-2.10</machine>
260
-      <machine maxCpus='255'>pc-0.11</machine>
261
-      <machine maxCpus='255'>pc-0.12</machine>
262
-      <machine maxCpus='255'>pc-0.10</machine>
263
-      <domain type='qemu'/>
264
-      <domain type='kvm'>
265
-        <emulator>/usr/bin/qemu-kvm</emulator>
266
-        <machine maxCpus='255'>pc-i440fx-2.11</machine>
267
-        <machine canonical='pc-i440fx-2.11' maxCpus='255'>pc</machine>
268
-        <machine maxCpus='1'>isapc</machine>
269
-        <machine maxCpus='255'>pc-1.1</machine>
270
-        <machine maxCpus='255'>pc-1.2</machine>
271
-        <machine maxCpus='255'>pc-1.3</machine>
272
-        <machine maxCpus='255'>pc-i440fx-2.8</machine>
273
-        <machine maxCpus='255'>pc-1.0</machine>
274
-        <machine maxCpus='255'>pc-i440fx-2.9</machine>
275
-        <machine maxCpus='255'>pc-i440fx-2.6</machine>
276
-        <machine maxCpus='255'>pc-i440fx-2.7</machine>
277
-        <machine maxCpus='128'>xenfv</machine>
278
-        <machine maxCpus='255'>pc-i440fx-2.3</machine>
279
-        <machine maxCpus='255'>pc-i440fx-2.4</machine>
280
-        <machine maxCpus='255'>pc-i440fx-2.5</machine>
281
-        <machine maxCpus='255'>pc-i440fx-2.1</machine>
282
-        <machine maxCpus='255'>pc-i440fx-2.2</machine>
283
-        <machine maxCpus='255'>pc-i440fx-2.0</machine>
284
-        <machine maxCpus='288'>pc-q35-2.11</machine>
285
-        <machine maxCpus='288'>q35</machine>
286
-        <machine maxCpus='1'>xenpv</machine>
287
-        <machine maxCpus='288'>pc-q35-2.10</machine>
288
-        <machine maxCpus='255'>pc-i440fx-1.7</machine>
289
-        <machine maxCpus='288'>pc-q35-2.9</machine>
290
-        <machine maxCpus='255'>pc-0.15</machine>
291
-        <machine maxCpus='255'>pc-i440fx-1.5</machine>
292
-        <machine maxCpus='255'>pc-q35-2.7</machine>
293
-        <machine maxCpus='255'>pc-i440fx-1.6</machine>
294
-        <machine maxCpus='288'>pc-q35-2.8</machine>
295
-        <machine maxCpus='255'>pc-0.13</machine>
296
-        <machine maxCpus='255'>pc-0.14</machine>
297
-        <machine maxCpus='255'>pc-q35-2.4</machine>
298
-        <machine maxCpus='255'>pc-q35-2.5</machine>
299
-        <machine maxCpus='255'>pc-q35-2.6</machine>
300
-        <machine maxCpus='255'>pc-i440fx-1.4</machine>
301
-        <machine maxCpus='255'>pc-i440fx-2.10</machine>
302
-        <machine maxCpus='255'>pc-0.11</machine>
303
-        <machine maxCpus='255'>pc-0.12</machine>
304
-        <machine maxCpus='255'>pc-0.10</machine>
305
-      </domain>
306
-    </arch>
307
-    <features>
308
-      <cpuselection/>
309
-      <deviceboot/>
310
-      <disksnapshot default='on' toggle='no'/>
311
-      <acpi default='on' toggle='yes'/>
312
-      <apic default='on' toggle='no'/>
313
-      <pae/>
314
-      <nonpae/>
315
-    </features>
316
-  </guest>''',
218
+    'i686': '''
219
+        <guest>
220
+           <os_type>hvm</os_type>
221
+           <arch name='i686'>
222
+             <wordsize>32</wordsize>
223
+             <emulator>/usr/bin/qemu-system-i386</emulator>
224
+             <machine maxCpus='255'>pc-i440fx-2.11</machine>
225
+             <machine canonical='pc-i440fx-2.11' maxCpus='255'>pc</machine>
226
+             <machine maxCpus='1'>isapc</machine>
227
+             <machine maxCpus='255'>pc-1.1</machine>
228
+             <machine maxCpus='255'>pc-1.2</machine>
229
+             <machine maxCpus='255'>pc-1.3</machine>
230
+             <machine maxCpus='255'>pc-i440fx-2.8</machine>
231
+             <machine maxCpus='255'>pc-1.0</machine>
232
+             <machine maxCpus='255'>pc-i440fx-2.9</machine>
233
+             <machine maxCpus='255'>pc-i440fx-2.6</machine>
234
+             <machine maxCpus='255'>pc-i440fx-2.7</machine>
235
+             <machine maxCpus='128'>xenfv</machine>
236
+             <machine maxCpus='255'>pc-i440fx-2.3</machine>
237
+             <machine maxCpus='255'>pc-i440fx-2.4</machine>
238
+             <machine maxCpus='255'>pc-i440fx-2.5</machine>
239
+             <machine maxCpus='255'>pc-i440fx-2.1</machine>
240
+             <machine maxCpus='255'>pc-i440fx-2.2</machine>
241
+             <machine maxCpus='255'>pc-i440fx-2.0</machine>
242
+             <machine maxCpus='288'>pc-q35-2.11</machine>
243
+             <machine maxCpus='288'>q35</machine>
244
+             <machine maxCpus='1'>xenpv</machine>
245
+             <machine maxCpus='288'>pc-q35-2.10</machine>
246
+             <machine maxCpus='255'>pc-i440fx-1.7</machine>
247
+             <machine maxCpus='288'>pc-q35-2.9</machine>
248
+             <machine maxCpus='255'>pc-0.15</machine>
249
+             <machine maxCpus='255'>pc-i440fx-1.5</machine>
250
+             <machine maxCpus='255'>pc-q35-2.7</machine>
251
+             <machine maxCpus='255'>pc-i440fx-1.6</machine>
252
+             <machine maxCpus='288'>pc-q35-2.8</machine>
253
+             <machine maxCpus='255'>pc-0.13</machine>
254
+             <machine maxCpus='255'>pc-0.14</machine>
255
+             <machine maxCpus='255'>pc-q35-2.4</machine>
256
+             <machine maxCpus='255'>pc-q35-2.5</machine>
257
+             <machine maxCpus='255'>pc-q35-2.6</machine>
258
+             <machine maxCpus='255'>pc-i440fx-1.4</machine>
259
+             <machine maxCpus='255'>pc-i440fx-2.10</machine>
260
+             <machine maxCpus='255'>pc-0.11</machine>
261
+             <machine maxCpus='255'>pc-0.12</machine>
262
+             <machine maxCpus='255'>pc-0.10</machine>
263
+             <domain type='qemu'/>
264
+             <domain type='kvm'>
265
+               <emulator>/usr/bin/qemu-kvm</emulator>
266
+               <machine maxCpus='255'>pc-i440fx-2.11</machine>
267
+               <machine canonical='pc-i440fx-2.11' maxCpus='255'>pc</machine>
268
+               <machine maxCpus='1'>isapc</machine>
269
+               <machine maxCpus='255'>pc-1.1</machine>
270
+               <machine maxCpus='255'>pc-1.2</machine>
271
+               <machine maxCpus='255'>pc-1.3</machine>
272
+               <machine maxCpus='255'>pc-i440fx-2.8</machine>
273
+               <machine maxCpus='255'>pc-1.0</machine>
274
+               <machine maxCpus='255'>pc-i440fx-2.9</machine>
275
+               <machine maxCpus='255'>pc-i440fx-2.6</machine>
276
+               <machine maxCpus='255'>pc-i440fx-2.7</machine>
277
+               <machine maxCpus='128'>xenfv</machine>
278
+               <machine maxCpus='255'>pc-i440fx-2.3</machine>
279
+               <machine maxCpus='255'>pc-i440fx-2.4</machine>
280
+               <machine maxCpus='255'>pc-i440fx-2.5</machine>
281
+               <machine maxCpus='255'>pc-i440fx-2.1</machine>
282
+               <machine maxCpus='255'>pc-i440fx-2.2</machine>
283
+               <machine maxCpus='255'>pc-i440fx-2.0</machine>
284
+               <machine maxCpus='288'>pc-q35-2.11</machine>
285
+               <machine maxCpus='288'>q35</machine>
286
+               <machine maxCpus='1'>xenpv</machine>
287
+               <machine maxCpus='288'>pc-q35-2.10</machine>
288
+               <machine maxCpus='255'>pc-i440fx-1.7</machine>
289
+               <machine maxCpus='288'>pc-q35-2.9</machine>
290
+               <machine maxCpus='255'>pc-0.15</machine>
291
+               <machine maxCpus='255'>pc-i440fx-1.5</machine>
292
+               <machine maxCpus='255'>pc-q35-2.7</machine>
293
+               <machine maxCpus='255'>pc-i440fx-1.6</machine>
294
+               <machine maxCpus='288'>pc-q35-2.8</machine>
295
+               <machine maxCpus='255'>pc-0.13</machine>
296
+               <machine maxCpus='255'>pc-0.14</machine>
297
+               <machine maxCpus='255'>pc-q35-2.4</machine>
298
+               <machine maxCpus='255'>pc-q35-2.5</machine>
299
+               <machine maxCpus='255'>pc-q35-2.6</machine>
300
+               <machine maxCpus='255'>pc-i440fx-1.4</machine>
301
+               <machine maxCpus='255'>pc-i440fx-2.10</machine>
302
+               <machine maxCpus='255'>pc-0.11</machine>
303
+               <machine maxCpus='255'>pc-0.12</machine>
304
+               <machine maxCpus='255'>pc-0.10</machine>
305
+             </domain>
306
+           </arch>
307
+           <features>
308
+             <cpuselection/>
309
+             <deviceboot/>
310
+             <disksnapshot default='on' toggle='no'/>
311
+             <acpi default='on' toggle='yes'/>
312
+             <apic default='on' toggle='no'/>
313
+             <pae/>
314
+             <nonpae/>
315
+           </features>
316
+         </guest>''',
317 317
 
318
-        'x86_64': '''
319
-  <guest>
320
-    <os_type>hvm</os_type>
321
-    <arch name='x86_64'>
322
-      <wordsize>64</wordsize>
323
-      <emulator>/usr/bin/qemu-system-x86_64</emulator>
324
-      <machine maxCpus='255'>pc-i440fx-2.11</machine>
325
-      <machine canonical='pc-i440fx-2.11' maxCpus='255'>pc</machine>
326
-      <machine maxCpus='1'>isapc</machine>
327
-      <machine maxCpus='255'>pc-1.1</machine>
328
-      <machine maxCpus='255'>pc-1.2</machine>
329
-      <machine maxCpus='255'>pc-1.3</machine>
330
-      <machine maxCpus='255'>pc-i440fx-2.8</machine>
331
-      <machine maxCpus='255'>pc-1.0</machine>
332
-      <machine maxCpus='255'>pc-i440fx-2.9</machine>
333
-      <machine maxCpus='255'>pc-i440fx-2.6</machine>
334
-      <machine maxCpus='255'>pc-i440fx-2.7</machine>
335
-      <machine maxCpus='128'>xenfv</machine>
336
-      <machine maxCpus='255'>pc-i440fx-2.3</machine>
337
-      <machine maxCpus='255'>pc-i440fx-2.4</machine>
338
-      <machine maxCpus='255'>pc-i440fx-2.5</machine>
339
-      <machine maxCpus='255'>pc-i440fx-2.1</machine>
340
-      <machine maxCpus='255'>pc-i440fx-2.2</machine>
341
-      <machine maxCpus='255'>pc-i440fx-2.0</machine>
342
-      <machine maxCpus='288'>pc-q35-2.11</machine>
343
-      <machine canonical='pc-q35-2.11' maxCpus='288'>q35</machine>
344
-      <machine maxCpus='1'>xenpv</machine>
345
-      <machine maxCpus='288'>pc-q35-2.10</machine>
346
-      <machine maxCpus='255'>pc-i440fx-1.7</machine>
347
-      <machine maxCpus='288'>pc-q35-2.9</machine>
348
-      <machine maxCpus='255'>pc-0.15</machine>
349
-      <machine maxCpus='255'>pc-i440fx-1.5</machine>
350
-      <machine maxCpus='255'>pc-q35-2.7</machine>
351
-      <machine maxCpus='255'>pc-i440fx-1.6</machine>
352
-      <machine maxCpus='288'>pc-q35-2.8</machine>
353
-      <machine maxCpus='255'>pc-0.13</machine>
354
-      <machine maxCpus='255'>pc-0.14</machine>
355
-      <machine maxCpus='255'>pc-q35-2.4</machine>
356
-      <machine maxCpus='255'>pc-q35-2.5</machine>
357
-      <machine maxCpus='255'>pc-q35-2.6</machine>
358
-      <machine maxCpus='255'>pc-i440fx-1.4</machine>
359
-      <machine maxCpus='255'>pc-i440fx-2.10</machine>
360
-      <machine maxCpus='255'>pc-0.11</machine>
361
-      <machine maxCpus='255'>pc-0.12</machine>
362
-      <machine maxCpus='255'>pc-0.10</machine>
363
-      <domain type='qemu'/>
364
-      <domain type='kvm'>
365
-        <emulator>/usr/bin/qemu-kvm</emulator>
366
-        <machine maxCpus='255'>pc-i440fx-2.11</machine>
367
-        <machine canonical='pc-i440fx-2.11' maxCpus='255'>pc</machine>
368
-        <machine maxCpus='1'>isapc</machine>
369
-        <machine maxCpus='255'>pc-1.1</machine>
370
-        <machine maxCpus='255'>pc-1.2</machine>
371
-        <machine maxCpus='255'>pc-1.3</machine>
372
-        <machine maxCpus='255'>pc-i440fx-2.8</machine>
373
-        <machine maxCpus='255'>pc-1.0</machine>
374
-        <machine maxCpus='255'>pc-i440fx-2.9</machine>
375
-        <machine maxCpus='255'>pc-i440fx-2.6</machine>
376
-        <machine maxCpus='255'>pc-i440fx-2.7</machine>
377
-        <machine maxCpus='128'>xenfv</machine>
378
-        <machine maxCpus='255'>pc-i440fx-2.3</machine>
379
-        <machine maxCpus='255'>pc-i440fx-2.4</machine>
380
-        <machine maxCpus='255'>pc-i440fx-2.5</machine>
381
-        <machine maxCpus='255'>pc-i440fx-2.1</machine>
382
-        <machine maxCpus='255'>pc-i440fx-2.2</machine>
383
-        <machine maxCpus='255'>pc-i440fx-2.0</machine>
384
-        <machine maxCpus='288'>pc-q35-2.11</machine>
385
-        <machine canonical='pc-q35-2.11' maxCpus='288'>q35</machine>
386
-        <machine maxCpus='1'>xenpv</machine>
387
-        <machine maxCpus='288'>pc-q35-2.10</machine>
388
-        <machine maxCpus='255'>pc-i440fx-1.7</machine>
389
-        <machine maxCpus='288'>pc-q35-2.9</machine>
390
-        <machine maxCpus='255'>pc-0.15</machine>
391
-        <machine maxCpus='255'>pc-i440fx-1.5</machine>
392
-        <machine maxCpus='255'>pc-q35-2.7</machine>
393
-        <machine maxCpus='255'>pc-i440fx-1.6</machine>
394
-        <machine maxCpus='288'>pc-q35-2.8</machine>
395
-        <machine maxCpus='255'>pc-0.13</machine>
396
-        <machine maxCpus='255'>pc-0.14</machine>
397
-        <machine maxCpus='255'>pc-q35-2.4</machine>
398
-        <machine maxCpus='255'>pc-q35-2.5</machine>
399
-        <machine maxCpus='255'>pc-q35-2.6</machine>
400
-        <machine maxCpus='255'>pc-i440fx-1.4</machine>
401
-        <machine maxCpus='255'>pc-i440fx-2.10</machine>
402
-        <machine maxCpus='255'>pc-0.11</machine>
403
-        <machine maxCpus='255'>pc-0.12</machine>
404
-        <machine maxCpus='255'>pc-0.10</machine>
405
-      </domain>
406
-    </arch>
407
-    <features>
408
-      <cpuselection/>
409
-      <deviceboot/>
410
-      <disksnapshot default='on' toggle='no'/>
411
-      <acpi default='on' toggle='yes'/>
412
-      <apic default='on' toggle='no'/>
413
-    </features>
414
-  </guest>''',
318
+    'x86_64': '''
319
+        <guest>
320
+          <os_type>hvm</os_type>
321
+          <arch name='x86_64'>
322
+            <wordsize>64</wordsize>
323
+            <emulator>/usr/bin/qemu-system-x86_64</emulator>
324
+            <machine maxCpus='255'>pc-i440fx-2.11</machine>
325
+            <machine canonical='pc-i440fx-2.11' maxCpus='255'>pc</machine>
326
+            <machine maxCpus='1'>isapc</machine>
327
+            <machine maxCpus='255'>pc-1.1</machine>
328
+            <machine maxCpus='255'>pc-1.2</machine>
329
+            <machine maxCpus='255'>pc-1.3</machine>
330
+            <machine maxCpus='255'>pc-i440fx-2.8</machine>
331
+            <machine maxCpus='255'>pc-1.0</machine>
332
+            <machine maxCpus='255'>pc-i440fx-2.9</machine>
333
+            <machine maxCpus='255'>pc-i440fx-2.6</machine>
334
+            <machine maxCpus='255'>pc-i440fx-2.7</machine>
335
+            <machine maxCpus='128'>xenfv</machine>
336
+            <machine maxCpus='255'>pc-i440fx-2.3</machine>
337
+            <machine maxCpus='255'>pc-i440fx-2.4</machine>
338
+            <machine maxCpus='255'>pc-i440fx-2.5</machine>
339
+            <machine maxCpus='255'>pc-i440fx-2.1</machine>
340
+            <machine maxCpus='255'>pc-i440fx-2.2</machine>
341
+            <machine maxCpus='255'>pc-i440fx-2.0</machine>
342
+            <machine maxCpus='288'>pc-q35-2.11</machine>
343
+            <machine canonical='pc-q35-2.11' maxCpus='288'>q35</machine>
344
+            <machine maxCpus='1'>xenpv</machine>
345
+            <machine maxCpus='288'>pc-q35-2.10</machine>
346
+            <machine maxCpus='255'>pc-i440fx-1.7</machine>
347
+            <machine maxCpus='288'>pc-q35-2.9</machine>
348
+            <machine maxCpus='255'>pc-0.15</machine>
349
+            <machine maxCpus='255'>pc-i440fx-1.5</machine>
350
+            <machine maxCpus='255'>pc-q35-2.7</machine>
351
+            <machine maxCpus='255'>pc-i440fx-1.6</machine>
352
+            <machine maxCpus='288'>pc-q35-2.8</machine>
353
+            <machine maxCpus='255'>pc-0.13</machine>
354
+            <machine maxCpus='255'>pc-0.14</machine>
355
+            <machine maxCpus='255'>pc-q35-2.4</machine>
356
+            <machine maxCpus='255'>pc-q35-2.5</machine>
357
+            <machine maxCpus='255'>pc-q35-2.6</machine>
358
+            <machine maxCpus='255'>pc-i440fx-1.4</machine>
359
+            <machine maxCpus='255'>pc-i440fx-2.10</machine>
360
+            <machine maxCpus='255'>pc-0.11</machine>
361
+            <machine maxCpus='255'>pc-0.12</machine>
362
+            <machine maxCpus='255'>pc-0.10</machine>
363
+            <domain type='qemu'/>
364
+            <domain type='kvm'>
365
+              <emulator>/usr/bin/qemu-kvm</emulator>
366
+              <machine maxCpus='255'>pc-i440fx-2.11</machine>
367
+              <machine canonical='pc-i440fx-2.11' maxCpus='255'>pc</machine>
368
+              <machine maxCpus='1'>isapc</machine>
369
+              <machine maxCpus='255'>pc-1.1</machine>
370
+              <machine maxCpus='255'>pc-1.2</machine>
371
+              <machine maxCpus='255'>pc-1.3</machine>
372
+              <machine maxCpus='255'>pc-i440fx-2.8</machine>
373
+              <machine maxCpus='255'>pc-1.0</machine>
374
+              <machine maxCpus='255'>pc-i440fx-2.9</machine>
375
+              <machine maxCpus='255'>pc-i440fx-2.6</machine>
376
+              <machine maxCpus='255'>pc-i440fx-2.7</machine>
377
+              <machine maxCpus='128'>xenfv</machine>
378
+              <machine maxCpus='255'>pc-i440fx-2.3</machine>
379
+              <machine maxCpus='255'>pc-i440fx-2.4</machine>
380
+              <machine maxCpus='255'>pc-i440fx-2.5</machine>
381
+              <machine maxCpus='255'>pc-i440fx-2.1</machine>
382
+              <machine maxCpus='255'>pc-i440fx-2.2</machine>
383
+              <machine maxCpus='255'>pc-i440fx-2.0</machine>
384
+              <machine maxCpus='288'>pc-q35-2.11</machine>
385
+              <machine canonical='pc-q35-2.11' maxCpus='288'>q35</machine>
386
+              <machine maxCpus='1'>xenpv</machine>
387
+              <machine maxCpus='288'>pc-q35-2.10</machine>
388
+              <machine maxCpus='255'>pc-i440fx-1.7</machine>
389
+              <machine maxCpus='288'>pc-q35-2.9</machine>
390
+              <machine maxCpus='255'>pc-0.15</machine>
391
+              <machine maxCpus='255'>pc-i440fx-1.5</machine>
392
+              <machine maxCpus='255'>pc-q35-2.7</machine>
393
+              <machine maxCpus='255'>pc-i440fx-1.6</machine>
394
+              <machine maxCpus='288'>pc-q35-2.8</machine>
395
+              <machine maxCpus='255'>pc-0.13</machine>
396
+              <machine maxCpus='255'>pc-0.14</machine>
397
+              <machine maxCpus='255'>pc-q35-2.4</machine>
398
+              <machine maxCpus='255'>pc-q35-2.5</machine>
399
+              <machine maxCpus='255'>pc-q35-2.6</machine>
400
+              <machine maxCpus='255'>pc-i440fx-1.4</machine>
401
+              <machine maxCpus='255'>pc-i440fx-2.10</machine>
402
+              <machine maxCpus='255'>pc-0.11</machine>
403
+              <machine maxCpus='255'>pc-0.12</machine>
404
+              <machine maxCpus='255'>pc-0.10</machine>
405
+            </domain>
406
+          </arch>
407
+          <features>
408
+            <cpuselection/>
409
+            <deviceboot/>
410
+            <disksnapshot default='on' toggle='no'/>
411
+            <acpi default='on' toggle='yes'/>
412
+            <apic default='on' toggle='no'/>
413
+          </features>
414
+        </guest>''',
415 415
 
416
-        'armv7l': '''
417
-  <guest>
418
-    <os_type>hvm</os_type>
419
-    <arch name='armv7l'>
420
-      <wordsize>32</wordsize>
421
-      <emulator>/usr/bin/qemu-system-arm</emulator>
422
-      <machine>integratorcp</machine>
423
-      <machine>vexpress-a9</machine>
424
-      <machine>syborg</machine>
425
-      <machine>musicpal</machine>
426
-      <machine>mainstone</machine>
427
-      <machine>n800</machine>
428
-      <machine>n810</machine>
429
-      <machine>n900</machine>
430
-      <machine>cheetah</machine>
431
-      <machine>sx1</machine>
432
-      <machine>sx1-v1</machine>
433
-      <machine>beagle</machine>
434
-      <machine>beaglexm</machine>
435
-      <machine>tosa</machine>
436
-      <machine>akita</machine>
437
-      <machine>spitz</machine>
438
-      <machine>borzoi</machine>
439
-      <machine>terrier</machine>
440
-      <machine>connex</machine>
441
-      <machine>verdex</machine>
442
-      <machine>lm3s811evb</machine>
443
-      <machine>lm3s6965evb</machine>
444
-      <machine>realview-eb</machine>
445
-      <machine>realview-eb-mpcore</machine>
446
-      <machine>realview-pb-a8</machine>
447
-      <machine>realview-pbx-a9</machine>
448
-      <machine>versatilepb</machine>
449
-      <machine>versatileab</machine>
450
-      <domain type='qemu'>
451
-      </domain>
452
-    </arch>
453
-    <features>
454
-      <deviceboot/>
455
-    </features>
456
-  </guest>''',
416
+    'armv7l': '''
417
+        <guest>
418
+          <os_type>hvm</os_type>
419
+          <arch name='armv7l'>
420
+            <wordsize>32</wordsize>
421
+            <emulator>/usr/bin/qemu-system-arm</emulator>
422
+            <machine>integratorcp</machine>
423
+            <machine>vexpress-a9</machine>
424
+            <machine>syborg</machine>
425
+            <machine>musicpal</machine>
426
+            <machine>mainstone</machine>
427
+            <machine>n800</machine>
428
+            <machine>n810</machine>
429
+            <machine>n900</machine>
430
+            <machine>cheetah</machine>
431
+            <machine>sx1</machine>
432
+            <machine>sx1-v1</machine>
433
+            <machine>beagle</machine>
434
+            <machine>beaglexm</machine>
435
+            <machine>tosa</machine>
436
+            <machine>akita</machine>
437
+            <machine>spitz</machine>
438
+            <machine>borzoi</machine>
439
+            <machine>terrier</machine>
440
+            <machine>connex</machine>
441
+            <machine>verdex</machine>
442
+            <machine>lm3s811evb</machine>
443
+            <machine>lm3s6965evb</machine>
444
+            <machine>realview-eb</machine>
445
+            <machine>realview-eb-mpcore</machine>
446
+            <machine>realview-pb-a8</machine>
447
+            <machine>realview-pbx-a9</machine>
448
+            <machine>versatilepb</machine>
449
+            <machine>versatileab</machine>
450
+            <domain type='qemu'>
451
+            </domain>
452
+          </arch>
453
+          <features>
454
+            <deviceboot/>
455
+          </features>
456
+        </guest>''',
457 457
 
458
-        'mips': '''
459
-  <guest>
460
-    <os_type>hvm</os_type>
461
-    <arch name='mips'>
462
-      <wordsize>32</wordsize>
463
-      <emulator>/usr/bin/qemu-system-mips</emulator>
464
-      <machine>malta</machine>
465
-      <machine>mipssim</machine>
466
-      <machine>magnum</machine>
467
-      <machine>pica61</machine>
468
-      <machine>mips</machine>
469
-      <domain type='qemu'>
470
-      </domain>
471
-    </arch>
472
-    <features>
473
-      <deviceboot/>
474
-    </features>
475
-  </guest>''',
458
+    'mips': '''
459
+        <guest>
460
+          <os_type>hvm</os_type>
461
+          <arch name='mips'>
462
+            <wordsize>32</wordsize>
463
+            <emulator>/usr/bin/qemu-system-mips</emulator>
464
+            <machine>malta</machine>
465
+            <machine>mipssim</machine>
466
+            <machine>magnum</machine>
467
+            <machine>pica61</machine>
468
+            <machine>mips</machine>
469
+            <domain type='qemu'>
470
+            </domain>
471
+          </arch>
472
+          <features>
473
+            <deviceboot/>
474
+          </features>
475
+        </guest>''',
476 476
 
477
-        'mipsel': '''
478
-  <guest>
479
-    <os_type>hvm</os_type>
480
-    <arch name='mipsel'>
481
-      <wordsize>32</wordsize>
482
-      <emulator>/usr/bin/qemu-system-mipsel</emulator>
483
-      <machine>malta</machine>
484
-      <machine>mipssim</machine>
485
-      <machine>magnum</machine>
486
-      <machine>pica61</machine>
487
-      <machine>mips</machine>
488
-      <domain type='qemu'>
489
-      </domain>
490
-    </arch>
491
-    <features>
492
-      <deviceboot/>
493
-    </features>
494
-  </guest>''',
477
+    'mipsel': '''
478
+        <guest>
479
+          <os_type>hvm</os_type>
480
+          <arch name='mipsel'>
481
+            <wordsize>32</wordsize>
482
+            <emulator>/usr/bin/qemu-system-mipsel</emulator>
483
+            <machine>malta</machine>
484
+            <machine>mipssim</machine>
485
+            <machine>magnum</machine>
486
+            <machine>pica61</machine>
487
+            <machine>mips</machine>
488
+            <domain type='qemu'>
489
+            </domain>
490
+          </arch>
491
+          <features>
492
+            <deviceboot/>
493
+          </features>
494
+        </guest>''',
495 495
 
496
-        'sparc': '''
497
-  <guest>
498
-    <os_type>hvm</os_type>
499
-    <arch name='sparc'>
500
-      <wordsize>32</wordsize>
501
-      <emulator>/usr/bin/qemu-system-sparc</emulator>
502
-      <machine>SS-5</machine>
503
-      <machine>leon3_generic</machine>
504
-      <machine>SS-10</machine>
505
-      <machine>SS-600MP</machine>
506
-      <machine>SS-20</machine>
507
-      <machine>Voyager</machine>
508
-      <machine>LX</machine>
509
-      <machine>SS-4</machine>
510
-      <machine>SPARCClassic</machine>
511
-      <machine>SPARCbook</machine>
512
-      <machine>SS-1000</machine>
513
-      <machine>SS-2000</machine>
514
-      <machine>SS-2</machine>
515
-      <domain type='qemu'>
516
-      </domain>
517
-    </arch>
518
-  </guest>''',
496
+    'sparc': '''
497
+        <guest>
498
+          <os_type>hvm</os_type>
499
+          <arch name='sparc'>
500
+            <wordsize>32</wordsize>
501
+            <emulator>/usr/bin/qemu-system-sparc</emulator>
502
+            <machine>SS-5</machine>
503
+            <machine>leon3_generic</machine>
504
+            <machine>SS-10</machine>
505
+            <machine>SS-600MP</machine>
506
+            <machine>SS-20</machine>
507
+            <machine>Voyager</machine>
508
+            <machine>LX</machine>
509
+            <machine>SS-4</machine>
510
+            <machine>SPARCClassic</machine>
511
+            <machine>SPARCbook</machine>
512
+            <machine>SS-1000</machine>
513
+            <machine>SS-2000</machine>
514
+            <machine>SS-2</machine>
515
+            <domain type='qemu'>
516
+            </domain>
517
+          </arch>
518
+        </guest>''',
519 519
 
520
-        'ppc': '''
521
-  <guest>
522
-    <os_type>hvm</os_type>
523
-    <arch name='ppc'>
524
-      <wordsize>32</wordsize>
525
-      <emulator>/usr/bin/qemu-system-ppc</emulator>
526
-      <machine>g3beige</machine>
527
-      <machine>virtex-ml507</machine>
528
-      <machine>mpc8544ds</machine>
529
-      <machine>bamboo-0.13</machine>
530
-      <machine>bamboo-0.12</machine>
531
-      <machine>ref405ep</machine>
532
-      <machine>taihu</machine>
533
-      <machine>mac99</machine>
534
-      <machine>prep</machine>
535
-      <domain type='qemu'>
536
-      </domain>
537
-    </arch>
538
-    <features>
539
-      <deviceboot/>
540
-    </features>
541
-  </guest>'''
520
+    'ppc': '''
521
+        <guest>
522
+          <os_type>hvm</os_type>
523
+          <arch name='ppc'>
524
+            <wordsize>32</wordsize>
525
+            <emulator>/usr/bin/qemu-system-ppc</emulator>
526
+            <machine>g3beige</machine>
527
+            <machine>virtex-ml507</machine>
528
+            <machine>mpc8544ds</machine>
529
+            <machine>bamboo-0.13</machine>
530
+            <machine>bamboo-0.12</machine>
531
+            <machine>ref405ep</machine>
532
+            <machine>taihu</machine>
533
+            <machine>mac99</machine>
534
+            <machine>prep</machine>
535
+            <domain type='qemu'>
536
+            </domain>
537
+          </arch>
538
+          <features>
539
+            <deviceboot/>
540
+          </features>
541
+        </guest>'''
542 542
 }
543 543
 
544 544
 CAPABILITIES_TEMPLATE = (

Loading…
Cancel
Save