← Back to branch summary

~ubuntu-branches/ubuntu/quantal/virtinst/quantal-proposed

« back to all changes in this revision

Viewing changes to tests/capabilities-xml/capabilities-test.xml

  • Committer: Bazaar Package Importer
  • Author(s): Marc Deslauriers
  • Date: 2011-02-01 15:40:11 UTC
  • mfrom: (1.3.16 experimental)
  • Revision ID: james.westby@ubuntu.com-20110201154011-op0nusgc240xajvb
Tags: 0.500.5-1ubuntu1
* Merge from debian experimental. Remaining changes:
  - debian/patches/9001_Ubuntu.patch:
     + Updated to add maverick and natty to OS list and enable virtio
       for them.
  - debian/patches/9003-fix-path-to-hvmloader-in-testsuite.patch: adjust
    testsuite for 0001-fix-path-to-hvmloader.patch and
    0002-Fix-path-to-pygrub.patch. (refreshed)
  - debian/control: added acl package to depends.
  - Demote virt-viewer to Suggests, as it's in universe.
  - Recommends libvirt-bin
* Removed patches:
  - debian/patches/9002-libvirt_disk_format.patch: Upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/capabilities-xml/capabilities-test.xml
1
1
<capabilities>
 
2
 
2
3
  <host>
3
4
    <cpu>
4
5
      <arch>i686</arch>
7
8
        <nonpae/>
8
9
      </features>
9
10
    </cpu>
 
11
    <topology>
 
12
      <cells num='2'>
 
13
        <cell id='0'>
 
14
          <cpus num='8'>
 
15
            <cpu id='0'/>
 
16
            <cpu id='2'/>
 
17
            <cpu id='4'/>
 
18
            <cpu id='6'/>
 
19
            <cpu id='8'/>
 
20
            <cpu id='10'/>
 
21
            <cpu id='12'/>
 
22
            <cpu id='14'/>
 
23
          </cpus>
 
24
        </cell>
 
25
        <cell id='1'>
 
26
          <cpus num='8'>
 
27
            <cpu id='1'/>
 
28
            <cpu id='3'/>
 
29
            <cpu id='5'/>
 
30
            <cpu id='7'/>
 
31
            <cpu id='9'/>
 
32
            <cpu id='11'/>
 
33
            <cpu id='13'/>
 
34
            <cpu id='15'/>
 
35
          </cpus>
 
36
        </cell>
 
37
      </cells>
 
38
    </topology>
 
39
    <secmodel>
 
40
      <model>testSecurity</model>
 
41
      <doi></doi>
 
42
    </secmodel>
10
43
  </host>
11
44
 
 
45
 
12
46
  <guest>
13
47
    <os_type>linux</os_type>
14
48
    <arch name="i686">