diff options
| author |   Daniel P. Berrange <berrange@redhat.com> | 2006-12-06 23:40:08 +0000 |
|---|---|---|
| committer | Daniel P. Berrange <berrange@redhat.com> | 2006-12-06 23:40:08 +0000 |
| commit | 98026c6b542317df18927ee96a948500a80e78cf (patch) | |
| tree | 80711ddaf9815fed1614d1a34b6a52887be68cd0 | |
| parent | * src/xen_internal.c: the structure passed to the vcpuinfo hypercall (diff) | |
| download | libvirt-98026c6b542317df18927ee96a948500a80e78cf.tar.gz libvirt-98026c6b542317df18927ee96a948500a80e78cf.tar.bz2 libvirt-98026c6b542317df18927ee96a948500a80e78cf.zip | |
Fix test case for change in bootloader handling
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | tests/xml2sexprdata/xml2sexpr-curmem.sexpr | 2 | ||||
| -rw-r--r-- | tests/xml2sexprdata/xml2sexpr-curmem.xml | 6 |
3 files changed, 6 insertions, 7 deletions
@@ -1,3 +1,8 @@ +Mon Dec 6 17:40:03 EST 2006 Daniel Berrange <berrange@redhat.com> + + * test/xml2sexprdata/xml2sexpr-curmem.xml, test/xml2sexprdata/xml2sexpr-curmem.sexpr: + Fix test case to reflect recent change to bootloader/image handling + Wed Dec 6 15:06:28 CET 2006 Daniel Veillard <veillard@redhat.com> * src/xen_internal.c: the structure passed to the vcpuinfo hypercall diff --git a/tests/xml2sexprdata/xml2sexpr-curmem.sexpr b/tests/xml2sexprdata/xml2sexpr-curmem.sexpr index 1ad4a784f..e1b589e01 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 '4f77abd2301958e83bab6fbf2118f880')(bootloader '/usr/bin/pygrub')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (linux (kernel '/var/lib/xen/vmlinuz.blj7cs')(ramdisk '/var/lib/xen/initrd.gULTf1')(args 'ro root=/dev/VolGroup00/LogVol00 rhgb quiet')(vnc 1)(vncdisplay 5)))(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 '4f77abd2301958e83bab6fbf2118f880')(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 diff --git a/tests/xml2sexprdata/xml2sexpr-curmem.xml b/tests/xml2sexprdata/xml2sexpr-curmem.xml index 55d49d32e..3347a7d35 100644 --- a/tests/xml2sexprdata/xml2sexpr-curmem.xml +++ b/tests/xml2sexprdata/xml2sexpr-curmem.xml @@ -2,12 +2,6 @@ <name>rhel5</name> <uuid>4f77abd2301958e83bab6fbf2118f880</uuid> <bootloader>/usr/bin/pygrub</bootloader> - <os> - <type>linux</type> - <kernel>/var/lib/xen/vmlinuz.blj7cs</kernel> - <initrd>/var/lib/xen/initrd.gULTf1</initrd> - <cmdline>ro root=/dev/VolGroup00/LogVol00 rhgb quiet</cmdline> - </os> <memory>394240</memory> <currentMemory>179200</currentMemory> <vcpu>1</vcpu> |