tests: move xml2sexpr tests to WITH_LIBXL

In preparation of removing the legacy Xen driver, move the
xml2sexpr tests from WITH_XEN to WITH_LIBXL. Even though the
legacy driver will be removed, we'll want to maintain the ability
to convert sexpr <-> XML.

There is some test file fallout due to differences in handling
of default values between xend and libxl.

Signed-off-by: Jim Fehlig <jfehlig@suse.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/tests/Makefile.am b/tests/Makefile.am
index f2f5caed4f3357cc8b39de74fa31261b34c7b82e..8e48acc691e401f78ea96c4c32020e599358d126 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -273,12 +273,12 @@ ssh_SOURCES = ssh.c
 ssh_LDADD = $(COVERAGE_LDFLAGS)
 
 if WITH_XEN
-test_programs += xml2sexprtest sexpr2xmltest \
+test_programs += sexpr2xmltest \
        xmconfigtest xencapstest
 endif WITH_XEN
 
 if WITH_LIBXL
-test_programs += xlconfigtest libxlxml2domconfigtest
+test_programs += xlconfigtest xml2sexprtest libxlxml2domconfigtest
 test_libraries += virmocklibxl.la
 endif WITH_LIBXL
 
@@ -502,11 +502,6 @@ if WITH_XEN
 xen_LDADDS = ../src/libvirt_driver_xen_impl.la
 xen_LDADDS += $(LDADDS)
 
-xml2sexprtest_SOURCES = \
-       xml2sexprtest.c testutilsxen.c testutilsxen.h \
-       testutils.c testutils.h
-xml2sexprtest_LDADD = $(xen_LDADDS)
-
 sexpr2xmltest_SOURCES = \
        sexpr2xmltest.c testutilsxen.c testutilsxen.h \
        testutils.c testutils.h
@@ -522,7 +517,7 @@ xencapstest_SOURCES = \
 xencapstest_LDADD = $(xen_LDADDS)
 
 else ! WITH_XEN
-EXTRA_DIST += xml2sexprtest.c sexpr2xmltest.c xmconfigtest.c \
+EXTRA_DIST += sexpr2xmltest.c xmconfigtest.c \
        xencapstest.c \
        testutilsxen.c testutilsxen.h
 endif ! WITH_XEN
@@ -539,6 +534,11 @@ xlconfigtest_SOURCES = \
        testutils.c testutils.h
 xlconfigtest_LDADD =$(libxl_LDADDS)
 
+xml2sexprtest_SOURCES = \
+       xml2sexprtest.c testutilsxen.c testutilsxen.h \
+       testutils.c testutils.h
+xml2sexprtest_LDADD = $(libxl_LDADDS)
+
 libxlxml2domconfigtest_SOURCES = \
        libxlxml2domconfigtest.c testutilsxen.c testutilsxen.h \
        testutils.c testutils.h
@@ -550,7 +550,7 @@ virmocklibxl_la_LDFLAGS = $(MOCKLIBS_LDFLAGS)
 virmocklibxl_la_LIBADD = $(MOCKLIBS_LIBS)
 
 else ! WITH_LIBXL
-EXTRA_DIST += xlconfigtest.c libxlxml2domconfigtest.c
+EXTRA_DIST += xlconfigtest.c xml2sexprtest.c libxlxml2domconfigtest.c
 endif ! WITH_LIBXL
 
 QEMUMONITORTESTUTILS_SOURCES = \

diff --git a/tests/xml2sexprdata/xml2sexpr-escape.sexpr b/tests/xml2sexprdata/xml2sexpr-escape.sexpr
index 3c2ab8cd29fcb944afd115f9daf78267cc3f21cb..75411ceb1ad7ff58d0505a4633db8b527cfc1bde 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-escape.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-escape.sexpr
@@ -5,7 +5,7 @@
 (ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
 (args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
 core/test/5.91/x86_64/os&version="devel"  ')\
-(loader '/usr/lib/xen/boot/hvmloader')(vcpus 2)(boot c)(usb 1)(parallel none)\
+(loader '/usr/lib/xen/boot/hvmloader')(vcpus 2)(boot c)(pae 1)(usb 1)(parallel none)\
 (serial pty)(device_model '/usr/lib/xen/bin/qemu-dm')(rtc_timeoffset 0)\
 (localtime 0)))(localtime 0)\
 (device (vbd (dev 'xvda:disk')(uname 'file:/root/\'\\some.img')(mode 'w'))))

diff --git a/tests/xml2sexprdata/xml2sexpr-fv-force-hpet.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-force-hpet.sexpr
index a6dcf1db430686a082fe8cfdfe8d419bcafb9f96..92ccfdfa1a9bac282479a79ab8d41324eca676e2 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-fv-force-hpet.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv-force-hpet.sexpr
@@ -2,7 +2,7 @@
 (uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(usb 1)(parallel none)(serial none)\
+(acpi 1)(pae 1)(usb 1)(parallel none)(serial none)\
 (device_model '/usr/lib64/xen/bin/qemu-dm')(hpet 1)(vnc 1)\
 (vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
 (localtime 0)\

diff --git a/tests/xml2sexprdata/xml2sexpr-fv-force-nohpet.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-force-nohpet.sexpr
index ffa33613d85f0b9a6189303bda097d3fc9128799..4455c425a40a6d10ffe0382fc66808ede2becd70 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-fv-force-nohpet.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv-force-nohpet.sexpr
@@ -2,7 +2,7 @@
 (uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(usb 1)(parallel none)(serial none)\
+(acpi 1)(pae 1)(usb 1)(parallel none)(serial none)\
 (device_model '/usr/lib64/xen/bin/qemu-dm')(hpet 0)(vnc 1)\
 (vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
 (localtime 0)\

diff --git a/tests/xml2sexprdata/xml2sexpr-fv-kernel.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-kernel.sexpr
index e2c15950f2a622b683f1cf5f6f08fef97a96a8ed..912ea32f727ebc554af4e6dff4c3fadc964c46e0 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-fv-kernel.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv-kernel.sexpr
@@ -5,7 +5,7 @@
 (ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
 (args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
 core/test/5.91/x86_64/os  ')(loader '/usr/lib/xen/boot/hvmloader')(vcpus 2)\
-(boot c)(usb 1)(parallel none)(serial pty)\
+(boot c)(pae 1)(usb 1)(parallel none)(serial pty)\
 (device_model '/usr/lib/xen/bin/qemu-dm')\
 (rtc_timeoffset 0)(localtime 0)))\
 (localtime 0)\

diff --git a/tests/xml2sexprdata/xml2sexpr-fv-localtime.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-localtime.sexpr
index 609fddd8ff8f657d77a0f12d12df39b1c341e588..75937fbd8113ca88299bb2d527222a99d3d2bb64 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-fv-localtime.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv-localtime.sexpr
@@ -2,7 +2,7 @@
 (uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(usb 1)(parallel none)(serial none)\
+(acpi 1)(pae 1)(usb 1)(parallel none)(serial none)\
 (device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)\
 (vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 1)))\
 (localtime 1)\

diff --git a/tests/xml2sexprdata/xml2sexpr-fv-net-netfront.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-net-netfront.sexpr
index 4e78d585fca9676583e344882a9dd2cf718b3670..429c1d057a8ca8d290cb5d5267c7324b6bd8ccbe 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-fv-net-netfront.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv-net-netfront.sexpr
@@ -1,7 +1,7 @@
 (vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
 (uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
 (on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)\
+(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)(pae 1)\
 (usb 1)(parallel none)(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')\
 (vnc 1)(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
 (localtime 0)\

diff --git a/tests/xml2sexprdata/xml2sexpr-fv-net-rate.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-net-rate.sexpr
index 03afedd56e394c5907d52424903baa9f380f8377..3c126efd3090f8841a39b2df1be78774553781d6 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-fv-net-rate.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv-net-rate.sexpr
@@ -1,7 +1,7 @@
 (vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
 (uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
 (on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)\
+(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)(pae 1)\
 (usb 1)(parallel none)(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')\
 (vnc 1)(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
 (localtime 0)\

diff --git a/tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.sexpr
index 549ada303b2280aa1337154c43b2e76c2eee84f5..60db1f9934ee1596ab7733f2a8a3e4f13c132fe9 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.sexpr
@@ -2,7 +2,7 @@
 (uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(usb 1)(parallel tcp:localhost:9999)\
+(acpi 1)(pae 1)(usb 1)(parallel tcp:localhost:9999)\
 (serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)\
 (vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
 (localtime 0)\

diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2-ports.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2-ports.sexpr
index 603108af5add17599a86224743e1bcb71da288d9..142377ea571c87821655a8e9ae7f1ff4d2a8a259 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2-ports.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2-ports.sexpr
@@ -2,7 +2,7 @@
 (uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(usb 1)(parallel none)\
+(acpi 1)(pae 1)(usb 1)(parallel none)\
 (serial (/dev/ttyS0 /dev/ttyS1))(device_model '/usr/lib64/xen/bin/qemu-dm')\
 (vnc 1)\
 (vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\

diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2nd-port.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2nd-port.sexpr
index 461c505abd057aa232d5da66b573b5739e7d51bf..f74ed39b46e7d62f1f377f897caed7d7efe3935f 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2nd-port.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2nd-port.sexpr
@@ -2,7 +2,7 @@
 (uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(usb 1)(parallel none)\
+(acpi 1)(pae 1)(usb 1)(parallel none)\
 (serial (none /dev/ttyS1))(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)\
 (vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
 (localtime 0)\

diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-file.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-serial-file.sexpr
index 04e21f0321b85c016debe17c31f59458e89f749d..be8ccc339196517d5630f023605e1a887309d79c 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-file.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-file.sexpr
@@ -2,7 +2,7 @@
 (uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(usb 1)(parallel none)\
+(acpi 1)(pae 1)(usb 1)(parallel none)\
 (serial file:/tmp/serial.log)(device_model '/usr/lib64/xen/bin/qemu-dm')\
 (vnc 1)\
 (vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\

diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-null.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-serial-null.sexpr
index 82d3211e23c3b714b09efd84979633726bc992c4..763ddf94377387c8d15a6ca2a2e30088f7d87830 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-null.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-null.sexpr
@@ -2,7 +2,7 @@
 (uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(usb 1)(parallel none)(serial null)\
+(acpi 1)(pae 1)(usb 1)(parallel none)(serial null)\
 (device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)\
 (vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
 (localtime 0)\

diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.sexpr
index 1c060e98c85e4388c1bb9aa24ef383b12eb41b3e..6ece05f9be4ad994acbdd24d11636cde5864bdc9 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.sexpr
@@ -2,7 +2,7 @@
 (uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(usb 1)(parallel none)\
+(acpi 1)(pae 1)(usb 1)(parallel none)\
 (serial pipe:/tmp/serial.pipe)(device_model '/usr/lib64/xen/bin/qemu-dm')\
 (vnc 1)\
 (vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\

diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-pty.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-serial-pty.sexpr
index 67b455419479b3b25a6f1e677be9c55aef5ae79b..73eed6489cb31556e691c5ddc8568d7da01d58da 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-pty.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-pty.sexpr
@@ -2,7 +2,7 @@
 (uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(usb 1)(parallel none)(serial pty)\
+(acpi 1)(pae 1)(usb 1)(parallel none)(serial pty)\
 (device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)\
 (vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
 (localtime 0)\

diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-stdio.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-serial-stdio.sexpr
index 2b00e77dc23bac079a280e7295d4c256aff68ed3..7f144bee024ad75ec41e00a65e3d0be9f24f069c 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-stdio.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-stdio.sexpr
@@ -2,7 +2,7 @@
 (uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(usb 1)(parallel none)(serial stdio)\
+(acpi 1)(pae 1)(usb 1)(parallel none)(serial stdio)\
 (device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)\
 (vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
 (localtime 0)\

diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp-telnet.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp-telnet.sexpr
index 79dd27f3f9fdb8e78006e58f94ee703d0f319d40..68204e60db5e4b5ee425809a48f67a9696ecb42c 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp-telnet.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp-telnet.sexpr
@@ -2,7 +2,7 @@
 (uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(usb 1)(parallel none)\
+(acpi 1)(pae 1)(usb 1)(parallel none)\
 (serial telnet:localhost:9999,server,nowait)\
 (device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)\
 (vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\

diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.sexpr
index cfc457f0828081470e2dda628d92e95cb313027b..4bec5ec09c969f40bf8328a11acf2ceda35c77d4 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.sexpr
@@ -2,7 +2,7 @@
 (uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(usb 1)(parallel none)\
+(acpi 1)(pae 1)(usb 1)(parallel none)\
 (serial tcp:localhost:9999,server,nowait)\
 (device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)\
 (vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\

diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-udp.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-serial-udp.sexpr
index 1d68353486b7bb9ad274b97d1cec209bcb1e20a8..c887edb9aa4deb4f52d6aed55a05f6c3248e6ae9 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-udp.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-udp.sexpr
@@ -2,7 +2,7 @@
 (uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(usb 1)(parallel none)\
+(acpi 1)(pae 1)(usb 1)(parallel none)\
 (serial udp:localhost:9998@localhost:9999)\
 (device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)\
 (vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\

diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-unix.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-serial-unix.sexpr
index e2b423455c53e7670db53f0dfd1f80eb2c821761..46c0905520263296c5a20a092a7c949995dd2ebf 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-unix.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-unix.sexpr
@@ -2,7 +2,7 @@
 (uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(usb 1)(parallel none)\
+(acpi 1)(pae 1)(usb 1)(parallel none)\
 (serial unix:/tmp/serial.sock,server,nowait)\
 (device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)\
 (vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\

diff --git a/tests/xml2sexprdata/xml2sexpr-fv-sound.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-sound.sexpr
index cba6c9a2878ee9f8ecf754930209c9e589e23428..8dfdaecf267c21b98ada293f1f1e09efa3a3fcec 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-fv-sound.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv-sound.sexpr
@@ -2,7 +2,7 @@
 (uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(usb 1)(parallel none)(serial none)\
+(acpi 1)(pae 1)(usb 1)(parallel none)(serial none)\
 (soundhw 'sb16,es1370')(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)\
 (vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
 (localtime 0)\

diff --git a/tests/xml2sexprdata/xml2sexpr-fv-usbmouse.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-usbmouse.sexpr
index 4ee94b40b2f59858d89ff0af2aeeb49099614e9f..8b97b1033e4e13ff27cfc2ffdff1f4a736dbfbaf 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-fv-usbmouse.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv-usbmouse.sexpr
@@ -2,7 +2,7 @@
 (uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(usb 1)(usbdevice mouse)(parallel none)\
+(acpi 1)(pae 1)(usb 1)(usbdevice mouse)(parallel none)\
 (serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)\
 (vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
 (localtime 0)\

diff --git a/tests/xml2sexprdata/xml2sexpr-fv-utc.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-utc.sexpr
index efd5e40975e247c37b23811011fffcae17bdbab6..87337649968a01a71fae5ba2d8414c203bd8b6ca 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-fv-utc.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv-utc.sexpr
@@ -2,7 +2,7 @@
 (uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(usb 1)(parallel none)(serial none)\
+(acpi 1)(pae 1)(usb 1)(parallel none)(serial none)\
 (device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)\
 (vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
 (localtime 0)\

diff --git a/tests/xml2sexprdata/xml2sexpr-fv-v2.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-v2.sexpr
index 5256f08189724ca03abf163aafa586e1fab75f13..30b7596962cbb1cdc07c862827da3c7a563c784f 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-fv-v2.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv-v2.sexpr
@@ -1,7 +1,7 @@
 (vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
 (uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
 (on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)\
+(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)(pae 1)\
 (usb 1)(parallel none)(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')\
 (vnc 1)(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
 (localtime 0)\

diff --git a/tests/xml2sexprdata/xml2sexpr-fv-vncunused.sexpr b/tests/xml2sexprdata/xml2sexpr-fv-vncunused.sexpr
index 25efd9a3b9c56b6ed905b97f96730cbc732a7127..31b56ee04e133e3d5f2bde8bce50d2a06f281bc4 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-fv-vncunused.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv-vncunused.sexpr
@@ -1,7 +1,7 @@
 (vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
 (uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
 (on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)\
+(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)(pae 1)\
 (usb 1)(parallel none)(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')\
 (vnc 1)(vncunused 1)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
 (localtime 0)(device (vbd (dev 'hda:disk')\

diff --git a/tests/xml2sexprdata/xml2sexpr-fv.sexpr b/tests/xml2sexprdata/xml2sexpr-fv.sexpr
index efd5e40975e247c37b23811011fffcae17bdbab6..87337649968a01a71fae5ba2d8414c203bd8b6ca 100644 (file)
--- a/tests/xml2sexprdata/xml2sexpr-fv.sexpr
+++ b/tests/xml2sexprdata/xml2sexpr-fv.sexpr
@@ -2,7 +2,7 @@
 (uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
 (on_reboot 'restart')(on_crash 'restart')\
 (image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
-(acpi 1)(usb 1)(parallel none)(serial none)\
+(acpi 1)(pae 1)(usb 1)(parallel none)(serial none)\
 (device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)\
 (vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
 (localtime 0)\

diff --git a/tests/xml2sexprtest.c b/tests/xml2sexprtest.c
index 977f5bdff2360582b16be61dc6acce893966719a..3e4d1d165e2d991c3611d31c80b78b5e74cd648d 100644 (file)
--- a/tests/xml2sexprtest.c
+++ b/tests/xml2sexprtest.c
@@ -8,12 +8,11 @@
 #include <unistd.h>
 
 #include "internal.h"
-#include "xen/xend_internal.h"
-#include "xen/xen_driver.h"
 #include "xenconfig/xen_sxpr.h"
 #include "testutils.h"
 #include "testutilsxen.h"
 #include "virstring.h"
+#include "libxl/libxl_conf.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 
@@ -95,10 +94,10 @@ mymain(void)
             ret = -1; \
     } while (0)
 
-    if (!(caps = testXenCapsInit()))
+    if (!(caps = testXLInitCaps()))
         return EXIT_FAILURE;
 
-    if (!(xmlopt = xenDomainXMLConfInit()))
+    if (!(xmlopt = libxlCreateXMLConf()))
         return EXIT_FAILURE;
 
     DO_TEST("pv", "pv", "pvtest");