← 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/compare/many-devices.xml

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2012-07-24 08:52:01 UTC
  • mfrom: (1.6.8 sid)
  • Revision ID: package-import@ubuntu.com-20120724085201-q3h0cbabg4t46gfm
Tags: 0.600.2-1ubuntu1
* Merge from debian unstable. Remaining changes:
  - 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.
  - debian/patches/9004_ubuntu_fix_tree_support.patch: Fix tree detection
    for all ISO/HTTP source, to not longer fail with cobbler/koan.
  - debian/patches/0004-Fix-path-to-qemu-dm.patch: fix the path to the
    qemu-dm binary.
  - debian/{control,rules,pyversions}: Build using dh_python2, use
    debhelper v8 instead of cdbs; for some reason the package build an
    empty binary package when using dh_python2.
  - debian/control: added acl package to depends.
  - debian/control: added libvirt-bin to recommends
* Dropped patches:
  - debian/patches/9005_ubuntu_releases.patch: Upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/cli-test-xml/compare/many-devices.xml
9
9
  </numatune>
10
10
  <os>
11
11
    <type arch='i686'>hvm</type>
 
12
    <loader>/foo/bar</loader>
12
13
    <boot dev='network'/>
13
14
    <boot dev='hd'/>
14
15
  </os>
23
24
    <emulator>/usr/bin/test-hv</emulator>
24
25
    <disk type='file' device='disk'>
25
26
      <driver cache='writeback' io='threads'/>
26
 
      <source file='/tmp/__virtinst_cli_exist1.img'/>
 
27
      <source file='/default-pool/UPPER'/>
27
28
      <target dev='hda' bus='ide'/>
28
29
      <shareable/>
29
30
      <serial>WD-WMAP9A966149</serial>
91
92
  </numatune>
92
93
  <os>
93
94
    <type arch='i686'>hvm</type>
 
95
    <loader>/foo/bar</loader>
94
96
    <boot dev='hd'/>
95
97
  </os>
96
98
  <features>
104
106
    <emulator>/usr/bin/test-hv</emulator>
105
107
    <disk type='file' device='disk'>
106
108
      <driver cache='writeback' io='threads'/>
107
 
      <source file='/tmp/__virtinst_cli_exist1.img'/>
 
109
      <source file='/default-pool/UPPER'/>
108
110
      <target dev='hda' bus='ide'/>
109
111
      <shareable/>
110
112
      <serial>WD-WMAP9A966149</serial>