From nobody Wed May 14 20:29:49 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 152229246870532.90389246932921; Wed, 28 Mar 2018 20:01:08 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CEF555D5ED; Thu, 29 Mar 2018 03:01:06 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 931745D759; Thu, 29 Mar 2018 03:01:06 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 26B3E181BA05; Thu, 29 Mar 2018 03:01:06 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w2T30fGZ007431 for ; Wed, 28 Mar 2018 23:00:41 -0400 Received: by smtp.corp.redhat.com (Postfix) id 95E8E5D72E; Thu, 29 Mar 2018 03:00:41 +0000 (UTC) Received: from mx1.redhat.com (ext-mx09.extmail.prod.ext.phx2.redhat.com [10.5.110.38]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8D0E85D72A for ; Thu, 29 Mar 2018 03:00:37 +0000 (UTC) Received: from smtp2.provo.novell.com (smtp2.provo.novell.com [137.65.250.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D407CA6E14 for ; Thu, 29 Mar 2018 03:00:34 +0000 (UTC) Received: from linux-tbji.provo.novell.com (prv-ext-foundry1int.gns.novell.com [137.65.251.240]) by smtp2.provo.novell.com with ESMTP (NOT encrypted); Wed, 28 Mar 2018 21:00:30 -0600 From: Jim Fehlig To: libvir-list@redhat.com Date: Wed, 28 Mar 2018 20:58:26 -0600 Message-Id: <20180329025832.22875-2-jfehlig@suse.com> In-Reply-To: <20180329025832.22875-1-jfehlig@suse.com> References: <20180329025832.22875-1-jfehlig@suse.com> X-Greylist: Sender passed SPF test, Sender IP whitelisted by DNSRBL, ACL 207 matched, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Thu, 29 Mar 2018 03:00:35 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Thu, 29 Mar 2018 03:00:35 +0000 (UTC) for IP:'137.65.250.81' DOMAIN:'smtp2.provo.novell.com' HELO:'smtp2.provo.novell.com' FROM:'jfehlig@suse.com' RCPT:'' X-RedHat-Spam-Score: -2.301 (RCVD_IN_DNSWL_MED, SPF_PASS) 137.65.250.81 smtp2.provo.novell.com 137.65.250.81 smtp2.provo.novell.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.38 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 1/7] tests: move xml2sexpr tests to WITH_LIBXL X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 29 Mar 2018 03:01:07 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" 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 --- 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 289ef35bd..8262ba202 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -272,12 +272,12 @@ ssh_SOURCES =3D ssh.c ssh_LDADD =3D $(COVERAGE_LDFLAGS) =20 if WITH_XEN -test_programs +=3D xml2sexprtest sexpr2xmltest \ +test_programs +=3D sexpr2xmltest \ xmconfigtest xencapstest endif WITH_XEN =20 if WITH_LIBXL -test_programs +=3D xlconfigtest libxlxml2domconfigtest +test_programs +=3D xlconfigtest xml2sexprtest libxlxml2domconfigtest test_libraries +=3D virmocklibxl.la endif WITH_LIBXL =20 @@ -501,11 +501,6 @@ if WITH_XEN xen_LDADDS =3D ../src/libvirt_driver_xen_impl.la xen_LDADDS +=3D $(LDADDS) =20 -xml2sexprtest_SOURCES =3D \ - xml2sexprtest.c testutilsxen.c testutilsxen.h \ - testutils.c testutils.h -xml2sexprtest_LDADD =3D $(xen_LDADDS) - sexpr2xmltest_SOURCES =3D \ sexpr2xmltest.c testutilsxen.c testutilsxen.h \ testutils.c testutils.h @@ -521,7 +516,7 @@ xencapstest_SOURCES =3D \ xencapstest_LDADD =3D $(xen_LDADDS) =20 else ! WITH_XEN -EXTRA_DIST +=3D xml2sexprtest.c sexpr2xmltest.c xmconfigtest.c \ +EXTRA_DIST +=3D sexpr2xmltest.c xmconfigtest.c \ xencapstest.c \ testutilsxen.c testutilsxen.h endif ! WITH_XEN @@ -538,6 +533,11 @@ xlconfigtest_SOURCES =3D \ testutils.c testutils.h xlconfigtest_LDADD =3D$(libxl_LDADDS) =20 +xml2sexprtest_SOURCES =3D \ + xml2sexprtest.c testutilsxen.c testutilsxen.h \ + testutils.c testutils.h +xml2sexprtest_LDADD =3D $(libxl_LDADDS) + libxlxml2domconfigtest_SOURCES =3D \ libxlxml2domconfigtest.c testutilsxen.c testutilsxen.h \ testutils.c testutils.h @@ -549,7 +549,7 @@ virmocklibxl_la_LDFLAGS =3D $(MOCKLIBS_LDFLAGS) virmocklibxl_la_LIBADD =3D $(MOCKLIBS_LIBS) =20 else ! WITH_LIBXL -EXTRA_DIST +=3D xlconfigtest.c libxlxml2domconfigtest.c +EXTRA_DIST +=3D xlconfigtest.c xml2sexprtest.c libxlxml2domconfigtest.c endif ! WITH_LIBXL =20 QEMUMONITORTESTUTILS_SOURCES =3D \ diff --git a/tests/xml2sexprdata/xml2sexpr-escape.sexpr b/tests/xml2sexprda= ta/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=3Dhttp://download.fedora.devel.redhat.com/pub/fedora/linux/\ core/test/5.91/x86_64/os&version=3D"devel" ')\ -(loader '/usr/lib/xen/boot/hvmloader')(vcpus 2)(boot c)(usb 1)(parallel no= ne)\ +(loader '/usr/lib/xen/boot/hvmloader')(vcpus 2)(boot c)(pae 1)(usb 1)(para= llel 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/xml2= sexprdata/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/xm= l2sexprdata/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/xml2sexp= rdata/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=3Dhttp://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/xml2s= exprdata/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/xm= l2sexprdata/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)(localti= me 0)))\ (localtime 0)\ diff --git a/tests/xml2sexprdata/xml2sexpr-fv-net-rate.sexpr b/tests/xml2se= xprdata/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)(localti= me 0)))\ (localtime 0)\ diff --git a/tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.sexpr b/tests/xm= l2sexprdata/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/te= sts/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/t= ests/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/xml= 2sexprdata/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/xml= 2sexprdata/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/xml= 2sexprdata/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/xml2= sexprdata/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/xm= l2sexprdata/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/tes= ts/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/xml2= sexprdata/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/xml2= sexprdata/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/xml= 2sexprdata/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/xml2sexpr= data/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/xml2se= xprdata/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/xml2sexprda= ta/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/xml2sexprdat= a/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)(localti= me 0)))\ (localtime 0)\ diff --git a/tests/xml2sexprdata/xml2sexpr-fv-vncunused.sexpr b/tests/xml2s= exprdata/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/x= ml2sexpr-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 =20 #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" =20 #define VIR_FROM_THIS VIR_FROM_NONE =20 @@ -95,10 +94,10 @@ mymain(void) ret =3D -1; \ } while (0) =20 - if (!(caps =3D testXenCapsInit())) + if (!(caps =3D testXLInitCaps())) return EXIT_FAILURE; =20 - if (!(xmlopt =3D xenDomainXMLConfInit())) + if (!(xmlopt =3D libxlCreateXMLConf())) return EXIT_FAILURE; =20 DO_TEST("pv", "pv", "pvtest"); --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list