Add test for recently fixed crash with latest XenD

Test case for the fix applied in

  commit 14435163a086c0bcdff04308077fa46a5fa08bb0
  Author: Daniel Veillard <veillard@redhat.com>
  Date:   Fri Jun 26 18:14:16 2009 +0000

* tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.sexpr,
  tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml: Data
  files exhibiting the crash
* tests/sexpr2xmltest.c: Process new data files

diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.sexpr b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.sexpr
new file mode 100644 (file)
index 0000000..e01ecb9
--- /dev/null
+++ b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.sexpr
@@ -0,0 +1,83 @@
+(domain
+    (domid 1)
+    (bootloader /usr/bin/pygrub)
+    (on_crash restart)
+    (uuid a36f6e38-f498-b06c-5fad-b04947392dbe)
+    (bootloader_args )
+    (vcpus 1)
+    (name test2vm)
+    (cpus (()))
+    (on_reboot restart)
+    (on_poweroff destroy)
+    (maxmem 512)
+    (memory 512)
+    (shadow_memory 0)
+    (features )
+    (on_xend_start ignore)
+    (on_xend_stop ignore)
+    (start_time 1250626179.35)
+    (cpu_time 21.397345341)
+    (online_vcpus 1)
+    (image
+        (linux
+            (kernel )
+            (device_model /usr/lib/xen/bin/qemu-dm)
+            (notes
+                (FEATURES
+'writable_page_tables|writable_descriptor_tables|auto_translated_physmap|pae_pgdir_above_4gb|supervisor_mode_kernel'
+                )
+                (VIRT_BASE 3221225472)
+                (GUEST_VERSION 2.6)
+                (PADDR_OFFSET 3221225472)
+                (GUEST_OS linux)
+                (HYPERCALL_PAGE 3225423872)
+                (LOADER generic)
+                (PAE_MODE yes)
+                (ENTRY 3225419776)
+                (XEN_VERSION xen-3.0)
+            )
+        )
+    )
+    (status 2)
+    (state -b----)
+    (store_mfn 262434)
+    (console_mfn 262433)
+    (device
+        (vif
+            (bridge virbr0)
+            (mac 00:16:36:68:9f:5d)
+            (script /etc/xen/scripts/vif-bridge)
+            (uuid 6435a5d4-9b8e-1e82-6863-5a6b57a4438d)
+            (backend 0)
+        )
+    )
+    (device (vkbd (backend 0)))
+    (device
+        (console
+            (protocol vt100)
+            (location 2)
+            (uuid 2e2c3247-5de1-7bd7-250a-41ab80030e72)
+        )
+    )
+    (device
+        (vbd
+            (protocol x86_32-abi)
+            (uuid 8f888aa8-a1c2-0c2b-0c70-4c3b96abe8c8)
+            (bootable 1)
+            (dev xvda:disk)
+            (uname phy:/dev/vg_dom0test/test2vm)
+            (mode w)
+            (backend 0)
+            (bootable 1)
+            (VDI )
+        )
+    )
+    (device
+        (vfb
+            (vncunused 1)
+            (vnc 1)
+            (uuid 5f61a036-660c-cdf3-8d20-16164b996e40)
+            (location 127.0.0.1:5900)
+        )
+    )
+)

diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml
new file mode 100644 (file)
index 0000000..19c7ab8
--- /dev/null
+++ b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml
@@ -0,0 +1,34 @@
+<domain type='xen' id='1'>
+  <name>test2vm</name>
+  <uuid>a36f6e38-f498-b06c-5fad-b04947392dbe</uuid>
+  <memory>524288</memory>
+  <currentMemory>524288</currentMemory>
+  <vcpu>1</vcpu>
+  <bootloader>/usr/bin/pygrub</bootloader>
+  <os>
+    <type>linux</type>
+  </os>
+  <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>restart</on_crash>
+  <devices>
+    <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
+    <disk type='block' device='disk'>
+      <driver name='phy'/>
+      <source dev='/dev/vg_dom0test/test2vm'/>
+      <target dev='xvda' bus='xen'/>
+    </disk>
+    <interface type='bridge'>
+      <mac address='00:16:36:68:9f:5d'/>
+      <source bridge='virbr0'/>
+      <script path='/etc/xen/scripts/vif-bridge'/>
+      <target dev='vif1.0'/>
+    </interface>
+    <console type='pty'>
+      <target port='0'/>
+    </console>
+    <input type='mouse' bus='xen'/>
+    <graphics type='vnc' port='-1' autoport='yes'/>
+  </devices>
+</domain>

diff --git a/tests/sexpr2xmltest.c b/tests/sexpr2xmltest.c
index 6b0b615ed56e0198ff4fb085e64631f90c0a13be..7b834a92002712a8f956380886741397e01aa47b 100644 (file)
--- a/tests/sexpr2xmltest.c
+++ b/tests/sexpr2xmltest.c
@@ -129,6 +129,7 @@ mymain(int argc, char **argv)
     DO_TEST("pv-vfb-orig", "pv-vfb-orig", 2);
     DO_TEST("pv-vfb-new", "pv-vfb-new", 3);
     DO_TEST("pv-vfb-new-vncdisplay", "pv-vfb-new-vncdisplay", 3);
+    DO_TEST("pv-vfb-type-crash", "pv-vfb-type-crash", 3);
     DO_TEST("fv-autoport", "fv-autoport", 3);
     DO_TEST("pv-bootloader", "pv-bootloader", 1);