[libvirt] [PATCH V2 1/8] tests: move xml2sexpr tests to WITH_LIBXL

Friday, 6 April 2018

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(a)suse.com&gt;
---
 tests/Makefile.am                                      | 18 +++++++++---------
 tests/xml2sexprdata/xml2sexpr-escape.sexpr             |  2 +-
 tests/xml2sexprdata/xml2sexpr-fv-force-hpet.sexpr      |  2 +-
 tests/xml2sexprdata/xml2sexpr-fv-force-nohpet.sexpr    |  2 +-
 tests/xml2sexprdata/xml2sexpr-fv-kernel.sexpr          |  2 +-
 tests/xml2sexprdata/xml2sexpr-fv-localtime.sexpr       |  2 +-
 tests/xml2sexprdata/xml2sexpr-fv-net-netfront.sexpr    |  2 +-
 tests/xml2sexprdata/xml2sexpr-fv-net-rate.sexpr        |  2 +-
 tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.sexpr    |  2 +-
 .../xml2sexpr-fv-serial-dev-2-ports.sexpr              |  2 +-
 .../xml2sexpr-fv-serial-dev-2nd-port.sexpr             |  2 +-
 tests/xml2sexprdata/xml2sexpr-fv-serial-file.sexpr     |  2 +-
 tests/xml2sexprdata/xml2sexpr-fv-serial-null.sexpr     |  2 +-
 tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.sexpr     |  2 +-
 tests/xml2sexprdata/xml2sexpr-fv-serial-pty.sexpr      |  2 +-
 tests/xml2sexprdata/xml2sexpr-fv-serial-stdio.sexpr    |  2 +-
 .../xml2sexprdata/xml2sexpr-fv-serial-tcp-telnet.sexpr |  2 +-
 tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.sexpr      |  2 +-
 tests/xml2sexprdata/xml2sexpr-fv-serial-udp.sexpr      |  2 +-
 tests/xml2sexprdata/xml2sexpr-fv-serial-unix.sexpr     |  2 +-
 tests/xml2sexprdata/xml2sexpr-fv-sound.sexpr           |  2 +-
 tests/xml2sexprdata/xml2sexpr-fv-usbmouse.sexpr        |  2 +-
 tests/xml2sexprdata/xml2sexpr-fv-utc.sexpr             |  2 +-
 tests/xml2sexprdata/xml2sexpr-fv-v2.sexpr              |  2 +-
 tests/xml2sexprdata/xml2sexpr-fv-vncunused.sexpr       |  2 +-
 tests/xml2sexprdata/xml2sexpr-fv.sexpr                 |  2 +-
 tests/xml2sexprtest.c                                  |  7 +++----
 27 files changed, 37 insertions(+), 38 deletions(-)

diff --git a/tests/Makefile.am b/tests/Makefile.am
index f2f5caed4..8e48acc69 100644
--- 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 3c2ab8cd2..75411ceb1 100644
--- 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 a6dcf1db4..92ccfdfa1 100644
--- 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 ffa33613d..4455c425a 100644
--- 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 e2c15950f..912ea32f7 100644
--- 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 609fddd8f..75937fbd8 100644
--- 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 4e78d585f..429c1d057 100644
--- 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 03afedd56..3c126efd3 100644
--- 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 549ada303..60db1f993 100644
--- 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 603108af5..142377ea5 100644
--- 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 461c505ab..f74ed39b4 100644
--- 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 04e21f032..be8ccc339 100644
--- 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 82d3211e2..763ddf943 100644
--- 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 1c060e98c..6ece05f9b 100644
--- 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 67b455419..73eed6489 100644
--- 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 2b00e77dc..7f144bee0 100644
--- 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 79dd27f3f..68204e60d 100644
--- 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 cfc457f08..4bec5ec09 100644
--- 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 1d6835348..c887edb9a 100644
--- 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 e2b423455..46c090552 100644
--- 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 cba6c9a28..8dfdaecf2 100644
--- 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 4ee94b40b..8b97b1033 100644
--- 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 efd5e4097..873376499 100644
--- 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 5256f0818..30b759696 100644
--- 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 25efd9a3b..31b56ee04 100644
--- 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 efd5e4097..873376499 100644
--- 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 977f5bdff..3e4d1d165 100644
--- 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");
-- 
2.16.3


    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

[libvirt] [PATCH V2 1/8] tests: move xml2sexpr tests to WITH_LIBXL