← Back to branch summary

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

« back to all changes in this revision

Viewing changes to .pc/9003-fix-path-to-hvmloader-in-testsuite.patch/tests/testdriver.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:
.pc/9003-fix-path-to-hvmloader-in-testsuite.patch/tests/testdriver.xml
1
1
<node>
2
2
 
3
3
  <cpu>
4
 
    <nodes>4</nodes>
 
4
    <nodes>1</nodes>
5
5
    <sockets>4</sockets>
6
6
    <cores>4</cores>
7
 
    <threads>4</threads>
 
7
    <threads>1</threads>
8
8
    <active>4</active>
9
9
    <mhz>4000</mhz>
10
10
    <model>i686</model>
30
30
</domain>
31
31
 
32
32
<domain type='xen'>
 
33
  <name>test-clone-simple</name>
 
34
  <currentMemory>204800</currentMemory>
 
35
  <memory>409600</memory>
 
36
  <uuid>12345678-1234-FFFF-1234-12345678FFFF</uuid>
 
37
  <os>
 
38
    <type arch='i686'>hvm</type>
 
39
    <loader>/usr/lib/xen/boot/hvmloader</loader>
 
40
    <boot dev='hd'/>
 
41
  </os>
 
42
  <features>
 
43
    <acpi/><apic/>
 
44
  </features>
 
45
  <clock offset="utc"/>
 
46
  <on_poweroff>destroy</on_poweroff>
 
47
  <on_reboot>restart</on_reboot>
 
48
  <on_crash>restart</on_crash>
 
49
  <vcpu>5</vcpu>
 
50
  <devices>
 
51
    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
 
52
    <disk type='file' device='disk'>
 
53
      <source file='/default-pool/test-clone-simple.img'/>
 
54
      <target dev='hda' bus='ide'/>
 
55
    </disk>
 
56
    <interface type='user'>
 
57
      <mac address='11:11:11:11:11:11'/>
 
58
    </interface>
 
59
    <parallel type='file'>
 
60
      <source path='/tmp/foo.log'/>
 
61
    </parallel>
 
62
  </devices>
 
63
</domain>
 
64
 
 
65
<domain type='xen'>
33
66
  <name>test-for-clone</name>
34
67
  <currentMemory>204800</currentMemory>
35
68
  <memory>409600</memory>
68
101
    </disk>
69
102
    <interface type='network'>
70
103
      <source network='default'/>
71
 
      <mac address='11:22:33:44:55:66'/>
 
104
      <mac address='11:22:33:12:34:AB'/>
72
105
      <model type='e1000'/>
73
106
    </interface>
74
107
    <interface type='user'>
92
125
  </ip>
93
126
</network>
94
127
 
 
128
<network>
 
129
  <name>route</name>
 
130
  <uuid>715666b7-aaaa-6c78-fa55-94863da09f2d</uuid>
 
131
  <forward mode='route'/>
 
132
  <ip address='192.168.123.1' netmask='255.255.255.0'>
 
133
    <dhcp>
 
134
      <range start='192.168.123.2' end='192.168.123.254' />
 
135
    </dhcp>
 
136
  </ip>
 
137
</network>
 
138
 
95
139
<pool type='dir'>
96
140
  <name>default-pool</name>
97
141
  <uuid>35bb2ad9-388a-cdfe-461a-b8907f6e53fe</uuid>
175
219
    </target>
176
220
  </volume>
177
221
  <volume>
 
222
    <name>test-clone-simple.img</name>
 
223
    <capacity>1000000</capacity>
 
224
    <allocation>50000</allocation>
 
225
    <target>
 
226
      <permissions>
 
227
        <mode>0700</mode>
 
228
        <owner>10736</owner>
 
229
        <group>10736</group>
 
230
      </permissions>
 
231
    </target>
 
232
  </volume>
 
233
  <volume>
178
234
    <name>collidevol1.img</name>
179
235
    <capacity>1000000</capacity>
180
236
    <allocation>50000</allocation>
293
349
  </volume>
294
350
</pool>
295
351
 
 
352
<pool type='iscsi'>
 
353
  <name>iscsi-pool</name>
 
354
  <uuid>abcdead9-388a-cdfe-461a-b8907f6e5aaa</uuid>
 
355
  <capacity>107374182400</capacity>
 
356
  <allocation>0</allocation>
 
357
  <available>107374182400</available>
 
358
  <source>
 
359
    <host name="iscsi.example.com"/>
 
360
    <device path="demo-target"/>
 
361
    <auth type='chap' login='foobar' passwd='frobbar'/>
 
362
  </source>
 
363
  <target>
 
364
    <path>/iscsi-pool</path>
 
365
    <permissions>
 
366
      <mode>0700</mode>
 
367
      <owner>10736</owner>
 
368
      <group>10736</group>
 
369
    </permissions>
 
370
  </target>
 
371
 
 
372
  <volume>
 
373
    <name>diskvol1</name>
 
374
    <capacity>1000000</capacity>
 
375
    <allocation>50000</allocation>
 
376
    <target>
 
377
      <format type='unknown'/>
 
378
      <permissions>
 
379
        <mode>0700</mode>
 
380
        <owner>10736</owner>
 
381
        <group>10736</group>
 
382
      </permissions>
 
383
    </target>
 
384
  </volume>
 
385
</pool>
 
386
 
296
387
<pool type='dir'>
297
388
  <name>full-pool</name>
298
389
  <uuid>35bb2ad9-388a-cdfe-461a-b8907f6e5555</uuid>