← Back to branch summary

~serge-hallyn/ubuntu/raring/libvirt/libvirt-hugepages

« back to all changes in this revision

Viewing changes to tests/qemuxml2argvdata/qemuxml2argv-boot-complex-bootindex.xml

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2012-05-13 15:44:12 UTC
  • mfrom: (1.2.13)
  • Revision ID: package-import@ubuntu.com-20120513154412-fgmn5sxqdzgnzlx3
Tags: 0.9.12-0ubuntu1
* New upstream version:
  * Synchronize with debian packaging:
    - debian/control: Update build depends.
    - debian/libvirt-bin.postrm: Cleanup /var/log/libvirt
      on purge.
    - Bump standards verson (no changes).
    - debian/patches/Don-t-fail-if-we-can-t-setup-avahi.patch: Added
  * Dropped patches:
    - debian/patches/Debianize-libvirt-guests.patch
    - debian/patches/rewrite-lxc-controller-eof-handling-yet-again
    - debian/patches/ubuntu/libnl13.patch
    - debian/patches/ubuntu/fix-lxc-startup-error.patch
    - debian/patches/ubuntu/fix-bridge-fd.patch
    - debian/patches/ubuntu/skip-labelling-network-disks.patch
    - debian/patches/ubuntu/xen-xend-shutdown-detection.patch
    - debian/patches/ubuntu/xen-config-no-vfb-for-hvm.patch
    - debian/patches/debian/Disable-daemon-start-test.patch
    - debian/patches/debian/Disable-gnulib-s-test-nonplocking-pipe.sh.patch
    - debian/patches/ubuntu/9006-default-config-test-case.patch
    - debian/patches/fix-block-migration.patch
    - debian/patches/ubuntu/9022-qemu-unescape-HMP-commands-before-converting-them-to.patch
    - debian/patches/ubuntu/9023-qemu-change-rbd-auth_supported-separation-character-.patch
    - debian/patches/ubuntu/9024-qemu-allow-snapshotting-of-sheepdog-and-rbd-disks.patch
    - debian/patches/9025-qemu-change-rbd-auth_supported-separation-character-.patch
    - debian/patches/ubuntu/arm-gcc-workaround.patch
  * Rediffed:
    - debian/patches/Allow-libvirt-group-to-access-the-socket.patch
    - debian/patches/Disable-failing-virnetsockettest.patch
    - debian/patches/dnsmasq-as-priv-user
    - debian/patches/9002-better_default_uri_virsh.patch
  * debian/control: Add libnl-route-3-dev ass a build depends.
  * debian/patches/libnl3-build-fix.patch: Fix build with libnl3.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/qemuxml2argvdata/qemuxml2argv-boot-complex-bootindex.xml
1
1
<domain type='qemu'>
2
2
  <name>QEMUGuest1</name>
3
3
  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
4
 
  <memory>219100</memory>
5
 
  <currentMemory>219100</currentMemory>
6
 
  <vcpu>1</vcpu>
 
4
  <memory unit='KiB'>219100</memory>
 
5
  <currentMemory unit='KiB'>219100</currentMemory>
 
6
  <vcpu placement='static'>1</vcpu>
7
7
  <os>
8
8
    <type arch='i686' machine='pc'>hvm</type>
9
9
    <boot dev='cdrom'/>
24
24
    <disk type='block' device='disk'>
25
25
      <source dev='/dev/HostVG/hdb'/>
26
26
      <target dev='hdb' bus='ide'/>
27
 
      <address type='drive' controller='0' bus='0' unit='1'/>
 
27
      <address type='drive' controller='0' bus='0' target='0' unit='1'/>
28
28
    </disk>
29
29
    <disk type='block' device='disk'>
30
30
      <source dev='/dev/HostVG/hda'/>
31
31
      <target dev='hda' bus='ide'/>
32
 
      <address type='drive' controller='0' bus='0' unit='0'/>
 
32
      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
33
33
    </disk>
34
34
    <disk type='file' device='disk'>
35
35
      <source file='/tmp/vda.img'/>
38
38
    <disk type='block' device='cdrom'>
39
39
      <source dev='/dev/HostVG/hdc'/>
40
40
      <target dev='hdc' bus='ide'/>
41
 
      <address type='drive' controller='0' bus='1' unit='0'/>
 
41
      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
42
42
    </disk>
43
43
    <disk type='block' device='floppy'>
44
44
      <source dev='/dev/fd1'/>
45
45
      <target dev='fdb' bus='fdc'/>
46
 
      <address type='drive' controller='0' bus='0' unit='1'/>
 
46
      <address type='drive' controller='0' bus='0' target='0' unit='1'/>
47
47
    </disk>
48
48
    <disk type='block' device='floppy'>
49
49
      <source dev='/dev/fd0'/>
50
50
      <target dev='fda' bus='fdc'/>
51
 
      <address type='drive' controller='0' bus='0' unit='0'/>
 
51
      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
52
52
    </disk>
 
53
    <controller type='usb' index='0'/>
53
54
    <controller type='fdc' index='0'/>
54
55
    <controller type='ide' index='0'/>
55
56
    <interface type='user'>