← 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/kvm-machine.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/compare/kvm-machine.xml
 
1
<domain type='kvm'>
 
2
  <name>foobar</name>
 
3
  <currentMemory>65536</currentMemory>
 
4
  <memory>65536</memory>
 
5
  <uuid>00000000-1111-2222-3333-444444444444</uuid>
 
6
  <os>
 
7
    <type arch='x86_64' machine='pc'>hvm</type>
 
8
    <boot dev='fd'/>
 
9
  </os>
 
10
  <features>
 
11
    <acpi/><apic/><pae/>
 
12
  </features>
 
13
  <clock offset="utc"/>
 
14
  <on_poweroff>destroy</on_poweroff>
 
15
  <on_reboot>restart</on_reboot>
 
16
  <on_crash>restart</on_crash>
 
17
  <vcpu>1</vcpu>
 
18
  <devices>
 
19
    <emulator>/usr/bin/qemu-kvm</emulator>
 
20
    <interface type='network'>
 
21
      <source network='default'/>
 
22
      <mac address='00:11:22:33:44:55'/>
 
23
      <model type='virtio'/>
 
24
    </interface>
 
25
    <input type='tablet' bus='usb'/>
 
26
    <graphics type='spice' port='-1' tlsPort='-1' autoport='yes'/>
 
27
    <console type='pty'/>
 
28
    <video>
 
29
      <model type='cirrus'/>
 
30
    </video>
 
31
  </devices>
 
32
</domain>