← Back to branch summary

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

« back to all changes in this revision

Viewing changes to tests/xmlconfig-xml/boot-many-devices.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/xmlconfig-xml/boot-many-devices.xml
3
3
  <currentMemory>204800</currentMemory>
4
4
  <memory>409600</memory>
5
5
  <uuid>12345678-1234-1234-1234-123456789012</uuid>
6
 
  <description>foooo barrrr 
7
 
 baz &amp;&amp; snarf. &apos;&apos; &quot;&quot; @@$
8
 
</description>
 
6
  <description>foooo barrrr somedesc</description>
9
7
  <os>
10
8
    <type arch='i686'>hvm</type>
11
9
    <loader>/usr/lib/xen-default/boot/hvmloader</loader>
50
48
    </interface>
51
49
    <input type='mouse' bus='ps2'/>
52
50
    <graphics type='sdl' display=':3.4' xauth='/tmp/.Xauthority'/>
 
51
    <graphics type='vnc' port='-1' keymap='en-us'/>
 
52
    <graphics type='vnc' port='-1'/>
 
53
    <graphics type='sdl' display=':3.4' xauth='/tmp/.Xauthority'/>
 
54
    <graphics type='spice' port='-1' tlsPort='-1' autoport='yes' keymap='en-us'/>
 
55
    <graphics type='sdl' display='foodisplay' xauth='fooxauth'/>
53
56
    <serial type='null'/>
54
57
    <parallel type='unix'>
55
58
      <source mode='bind' path='/tmp/foobar'/>
65
68
    <video>
66
69
      <model type='cirrus'/>
67
70
    </video>
 
71
    <video>
 
72
      <model type='qxl'/>
 
73
    </video>
68
74
    <hostdev mode='subsystem' type='usb' managed='yes'>
69
75
      <source>
70
76
        <vendor id='0x4321'/>