diff options
| author |   Daniel Veillard <veillard@redhat.com> | 2007-04-11 16:06:30 +0000 |
|---|---|---|
| committer | Daniel Veillard <veillard@redhat.com> | 2007-04-11 16:06:30 +0000 |
| commit | 1ec25df269d327e19e8ed876032b11760675a52b (patch) | |
| tree | 18f9ef8ae72a4e4fcfc74c30e0e3cb22141045fa /tests/sexpr2xmldata | |
| parent | Fixed up IPtables rules to be more strict (diff) | |
| download | libvirt-1ec25df269d327e19e8ed876032b11760675a52b.tar.gz libvirt-1ec25df269d327e19e8ed876032b11760675a52b.tar.bz2 libvirt-1ec25df269d327e19e8ed876032b11760675a52b.zip | |
* src/xend_internal.c src/xml.c: applied patch from Nobuhiro Itou
to handle CDRom devices with no device name
* tests/sexpr2xmltest.c tests/xml2sexprtest.c
tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.sexpr
tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml
tests/xml2sexprdata/xml2sexpr-no-source-cdrom.sexpr
tests/xml2sexprdata/xml2sexpr-no-source-cdrom.xml: added regression
tests for this case based on Nobuhiro Itou test inputs.
Daniel
Diffstat (limited to 'tests/sexpr2xmldata')
| -rw-r--r-- | tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.sexpr | 66 | ||||
| -rw-r--r-- | tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml | 36 |
2 files changed, 102 insertions, 0 deletions
diff --git a/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.sexpr b/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.sexpr new file mode 100644 index 000000000..f3e4901e4 --- /dev/null +++ b/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.sexpr @@ -0,0 +1,66 @@ +(domain + (domid 6) + (on_crash destroy) + (memory 350) + (uuid cc2315e7-d26a-307a-438c-6d188ec4c09c) + (bootloader_args ) + (name test) + (maxmem 382) + (on_reboot destroy) + (on_poweroff destroy) + (localtime 0) + (vcpus 1) + (bootloader ) + (shadow_memory 4) + (cpu_weight 256) + (cpu_cap 0) + (features ) + (on_xend_start ignore) + (on_xend_stop ignore) + (start_time 1175165307.38) + (cpu_time 0.956663338) + (online_vcpus 1) + (image + (hvm + (kernel /usr/lib/xen/boot/hvmloader) + (vnc 1) + (vncunused 1) + (device_model /usr/lib/xen/bin/qemu-dm) + (pae 1) + (apic 1) + (acpi 1) + (boot c) + (serial pty) + (vcpus 1) + ) + ) + (status 0) + (memory_dynamic_min 358) + (memory_dynamic_max 382) + (store_mfn 89598) + (device + (vif + (bridge xenbr0) + (mac 00:16:3e:0a:7b:39) + (type ioemu) + (uuid 127fee09-a0c8-c79b-4ee5-6c194efff73a) + ) + ) + (device + (vbd + (uname phy:/dev/sda8) + (driver paravirtualised) + (mode w) + (dev hda:disk) + (uuid df6969ad-d312-deb1-8d36-223d71e4ce95) + ) + ) + (device + (vbd + (driver paravirtualised) + (mode r) + (dev hdc:cdrom) + (uuid fca3aa85-1d1f-2c31-2f0b-f2dff2311f7e) + ) + ) +) diff --git a/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml b/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml new file mode 100644 index 000000000..5b9c7f61f --- /dev/null +++ b/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml @@ -0,0 +1,36 @@ +<domain type='xen' id='6'> + <name>test</name> + <uuid>cc2315e7d26a307a438c6d188ec4c09c</uuid> + <os> + <type>hvm</type> + <loader>/usr/lib/xen/boot/hvmloader</loader> + <boot dev='hd'/> + </os> + <memory>391168</memory> + <currentMemory>358400</currentMemory> + <vcpu>1</vcpu> + <on_poweroff>destroy</on_poweroff> + <on_reboot>destroy</on_reboot> + <on_crash>destroy</on_crash> + <features> + <acpi/> + <apic/> + <pae/> + </features> + <devices> + <emulator>/usr/lib/xen/bin/qemu-dm</emulator> + <interface type='ethernet'> + <mac address='00:16:3e:0a:7b:39'/> + </interface> + <disk type='block' device='disk'> + <driver name='phy'/> + <source dev='/dev/sda8'/> + <target dev='hda:disk'/> + </disk> + <disk device='cdrom'> + <target dev='hdc'/> + <readonly/> + </disk> + <graphics type='vnc' port='5906'/> + </devices> +</domain> |