← Back to branch summary

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

« back to all changes in this revision

Viewing changes to tests/cli-test-xml/image.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/cli-test-xml/image.xml
10
10
      <os>
11
11
        <loader>pygrub</loader>
12
12
      </os>
13
 
      <drive disk="cli_root.raw" target="xvda"/>
14
 
      <drive disk="cli_scratch.raw" target="xvdc"/>
 
13
      <drive disk="/tmp/__virtinst__cli_root.raw" target="xvda"/>
 
14
      <drive disk="/tmp/__virtinst__cli_scratch.raw" target="xvdc"/>
15
15
    </boot>
16
16
    <boot type="hvm">
17
17
      <guest>
22
22
        <type>hvm</type>
23
23
        <loader dev="hd"/>
24
24
      </os>
25
 
      <drive disk="cli_root.raw" target="hda"/>
 
25
      <drive disk="/tmp/__virtinst__cli_root.raw" target="hda"/>
26
26
    </boot>
27
27
    <devices>
28
28
       <vcpu>7</vcpu>
32
32
    </devices>
33
33
  </domain>
34
34
  <storage>
35
 
    <disk file="cli_root.raw" format="raw" size="4096" use="system"/>
36
 
    <disk file="cli_scratch.raw" format="raw" size='100' use='scratch'/>
 
35
    <disk file="/tmp/__virtinst__cli_root.raw" format="raw" size="4096" use="system"/>
 
36
    <disk file="/tmp/__virtinst__cli_scratch.raw" format="raw" size='100' use='scratch'/>
37
37
  </storage>
38
38
</image>