← 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): Jean-Louis Dupond
  • Date: 2010-05-05 03:32:42 UTC
  • mfrom: (1.3.13 sid)
  • Revision ID: james.westby@ubuntu.com-20100505033242-um6f6pjcc89i07m0
Tags: 0.500.3-1ubuntu1
https://launchpad.net/bugs/590068
https://launchpad.net/bugs/524318
https://launchpad.net/bugs/533048
https://launchpad.net/bugs/215084
* Merge from debian unstable. (LP: #590068)  Remaining changes:
  - debian/patches/9001_Ubuntu.patch:
     + Added lucid and maverick to OS list and enable virtio for it.
  - debian/patches/0003-Fix-patch-to-keyboard-configuration.patch: disable
    as the keyboard config in Ubuntu is still in /etc/default/console-setup
    and this was causing virt-manager to always default to a en-us
    keyboard. (LP: #524318)
  - debian/control: added acl package to depends. (LP: #533048)
  - Demote virt-viewer to Suggests, as it's in universe.
  - Recommends libvirt-bin (LP: #215084)
* debian/patches/9002-add-ca-keymap.patch: dropped, its now in 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
9
  <os>
7
10
    <type arch='i686'>hvm</type>
8
11
    <loader>/usr/lib/xen/boot/hvmloader</loader>
11
14
  <features>
12
15
    <acpi/><apic/>
13
16
  </features>
14
 
  <clock offset="utc"/>
 
17
  <clock offset="localtime"/>
15
18
  <on_poweroff>destroy</on_poweroff>
16
19
  <on_reboot>restart</on_reboot>
17
20
  <on_crash>restart</on_crash>
26
29
      <source dev='/dev/loop0'/>
27
30
      <target dev='sda' bus='scsi'/>
28
31
    </disk>
 
32
    <disk type='dir' device='floppy'>
 
33
      <source dir='/tmp'/>
 
34
      <target dev='fdb' bus='fdc'/>
 
35
    </disk>
29
36
    <disk type='file' device='disk'>
30
37
      <driver name='qemu' type='qcow2'/>
31
38
      <source file='/default-pool/testvol1.img'/>
32
39
      <target dev='sdb' bus='scsi'/>
33
40
    </disk>
 
41
    <controller type='ide' index='3'/>
 
42
    <controller type='virtio-serial' index='0' ports='32' vectors='17'/>
34
43
    <interface type='network'>
35
44
      <source network='default'/>
36
45
      <mac address='11:22:33:44:55:66'/>
53
62
    <video>
54
63
      <model type='cirrus' vram='10240' heads='3'/>
55
64
    </video>
 
65
    <video>
 
66
      <model type='cirrus'/>
 
67
    </video>
56
68
    <hostdev mode='subsystem' type='usb' managed='yes'>
57
69
      <source>
58
70
        <vendor id='0x4321'/>
59
71
        <product id='0x1234'/>
60
72
      </source>
61
73
    </hostdev>
 
74
    <watchdog model='ib700' action='none'/>
62
75
  </devices>
 
76
  <seclabel type='static' model='selinux'>
 
77
    <label>foolabel</label>
 
78
    <imagelabel>imagelabel</imagelabel>
 
79
  </seclabel>
63
80
</domain>