diff options
| author |   Jim Meyering <meyering@redhat.com> | 2010-03-22 20:21:18 +0100 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2010-03-23 11:22:26 +0100 |
| commit | 67904847f08553649a43a69cb9c73727c9e6f718 (patch) | |
| tree | aae36270d3d62c8949deb519ba4a9bc4a238f34b /tests/xml2sexprdata | |
| parent | virDiskNameToIndex: ignore trailing digits (diff) | |
| download | libvirt-67904847f08553649a43a69cb9c73727c9e6f718.tar.gz libvirt-67904847f08553649a43a69cb9c73727c9e6f718.tar.bz2 libvirt-67904847f08553649a43a69cb9c73727c9e6f718.zip | |
tests: do not use the ":disk" suffix in sample xml input
* tests/xml2sexprdata/xml2sexpr-curmem.xml: Remove ":disk" suffix from
"<target dev=" value.
* tests/xml2sexprdata/xml2sexpr-pv-localtime.xml: Likewise.
* tests/xml2sexprdata/xml2sexpr-curmem.sexpr: Update expected output
to match.
* tests/xml2sexprdata/xml2sexpr-pv-localtime.sexpr: Likewise.
Diffstat (limited to 'tests/xml2sexprdata')
| -rw-r--r-- | tests/xml2sexprdata/xml2sexpr-curmem.sexpr | 2 | ||||
| -rw-r--r-- | tests/xml2sexprdata/xml2sexpr-curmem.xml | 2 | ||||
| -rw-r--r-- | tests/xml2sexprdata/xml2sexpr-pv-localtime.sexpr | 2 | ||||
| -rw-r--r-- | tests/xml2sexprdata/xml2sexpr-pv-localtime.xml | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/tests/xml2sexprdata/xml2sexpr-curmem.sexpr b/tests/xml2sexprdata/xml2sexpr-curmem.sexpr index 321af9bad..4b9c9a7cd 100644 --- a/tests/xml2sexprdata/xml2sexpr-curmem.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-curmem.sexpr @@ -1 +1 @@ -(vm (name 'rhel5')(memory 175)(maxmem 385)(vcpus 1)(uuid '4f77abd2-3019-58e8-3bab-6fbf2118f880')(bootloader '/usr/bin/pygrub')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(device (tap (dev 'xvda:disk')(uname 'tap:aio:/xen/rhel5.img')(mode 'w')))(device (vif (mac '00:16:3e:1d:06:15')(bridge 'xenbr0')(script 'vif-bridge'))))
\ No newline at end of file +(vm (name 'rhel5')(memory 175)(maxmem 385)(vcpus 1)(uuid '4f77abd2-3019-58e8-3bab-6fbf2118f880')(bootloader '/usr/bin/pygrub')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(device (tap (dev 'xvda')(uname 'tap:aio:/xen/rhel5.img')(mode 'w')))(device (vif (mac '00:16:3e:1d:06:15')(bridge 'xenbr0')(script 'vif-bridge'))))
\ No newline at end of file diff --git a/tests/xml2sexprdata/xml2sexpr-curmem.xml b/tests/xml2sexprdata/xml2sexpr-curmem.xml index 3347a7d35..6d1741d85 100644 --- a/tests/xml2sexprdata/xml2sexpr-curmem.xml +++ b/tests/xml2sexprdata/xml2sexpr-curmem.xml @@ -17,7 +17,7 @@ <disk type='file' device='disk'> <driver name='tap' type='aio'/> <source file='/xen/rhel5.img'/> - <target dev='xvda:disk'/> + <target dev='xvda'/> </disk> <graphics type='vnc' port='5905'/> </devices> diff --git a/tests/xml2sexprdata/xml2sexpr-pv-localtime.sexpr b/tests/xml2sexprdata/xml2sexpr-pv-localtime.sexpr index af4582f4c..16bbdfd2d 100644 --- a/tests/xml2sexprdata/xml2sexpr-pv-localtime.sexpr +++ b/tests/xml2sexprdata/xml2sexpr-pv-localtime.sexpr @@ -1 +1 @@ -(vm (name 'rhel5')(memory 175)(maxmem 385)(vcpus 1)(uuid '4f77abd2-3019-58e8-3bab-6fbf2118f880')(bootloader '/usr/bin/pygrub')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(localtime 1)(device (tap (dev 'xvda:disk')(uname 'tap:aio:/xen/rhel5.img')(mode 'w')))(device (vif (mac '00:16:3e:1d:06:15')(bridge 'xenbr0')(script 'vif-bridge'))))
\ No newline at end of file +(vm (name 'rhel5')(memory 175)(maxmem 385)(vcpus 1)(uuid '4f77abd2-3019-58e8-3bab-6fbf2118f880')(bootloader '/usr/bin/pygrub')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(localtime 1)(device (tap (dev 'xvda')(uname 'tap:aio:/xen/rhel5.img')(mode 'w')))(device (vif (mac '00:16:3e:1d:06:15')(bridge 'xenbr0')(script 'vif-bridge'))))
\ No newline at end of file diff --git a/tests/xml2sexprdata/xml2sexpr-pv-localtime.xml b/tests/xml2sexprdata/xml2sexpr-pv-localtime.xml index e78c09c04..2ce1e44ac 100644 --- a/tests/xml2sexprdata/xml2sexpr-pv-localtime.xml +++ b/tests/xml2sexprdata/xml2sexpr-pv-localtime.xml @@ -18,7 +18,7 @@ <disk type='file' device='disk'> <driver name='tap' type='aio'/> <source file='/xen/rhel5.img'/> - <target dev='xvda:disk'/> + <target dev='xvda'/> </disk> <graphics type='vnc' port='5905'/> </devices> |