From nobody Wed May 14 20:31:23 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 1522292449045883.1779339581456; Wed, 28 Mar 2018 20:00:49 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CB7B195620; Thu, 29 Mar 2018 03:00:46 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C413E6767D; Thu, 29 Mar 2018 03:00:45 +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 A77324CA97; Thu, 29 Mar 2018 03:00:42 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w2T30fr5007418 for ; Wed, 28 Mar 2018 23:00:41 -0400 Received: by smtp.corp.redhat.com (Postfix) id 394AE5D759; Thu, 29 Mar 2018 03:00:41 +0000 (UTC) Received: from mx1.redhat.com (ext-mx02.extmail.prod.ext.phx2.redhat.com [10.5.110.26]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 30BFA5D6A8 for ; Thu, 29 Mar 2018 03:00:38 +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 D65928762D 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:31 -0600 From: Jim Fehlig To: libvir-list@redhat.com Date: Wed, 28 Mar 2018 20:58:28 -0600 Message-Id: <20180329025832.22875-4-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.26]); Thu, 29 Mar 2018 03:00:35 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); 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.26 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 3/7] tests: move xmconfig 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.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Thu, 29 Mar 2018 03:00:47 +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 xmconfig tests from WITH_XEN to WITH_LIBXL. Even though the legacy driver will be removed, we'll want to maintain the ability to convert xm config to XML. Requires fixing up the tests to account for different behavior of Xen vs libxl post parse functions. For consistency with other Xen config tests, change the arch to x86_64. 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 | 19 +++++++++---------- tests/xmconfigdata/test-disk-drv-blktap-raw.xml | 3 +-- tests/xmconfigdata/test-disk-drv-blktap2-raw.xml | 3 +-- tests/xmconfigdata/test-escape-paths.xml | 11 +++++------ .../xmconfigdata/test-fullvirt-default-feature.xml | 9 ++++----- tests/xmconfigdata/test-fullvirt-force-hpet.xml | 9 ++++----- tests/xmconfigdata/test-fullvirt-force-nohpet.xml | 9 ++++----- tests/xmconfigdata/test-fullvirt-localtime.xml | 9 ++++----- tests/xmconfigdata/test-fullvirt-net-netfront.xml | 9 ++++----- tests/xmconfigdata/test-fullvirt-new-cdrom.xml | 9 ++++----- tests/xmconfigdata/test-fullvirt-nohap.xml | 9 ++++----- tests/xmconfigdata/test-fullvirt-parallel-tcp.xml | 9 ++++----- tests/xmconfigdata/test-fullvirt-serial-file.xml | 9 ++++----- tests/xmconfigdata/test-fullvirt-serial-null.xml | 9 ++++----- tests/xmconfigdata/test-fullvirt-serial-pipe.xml | 9 ++++----- tests/xmconfigdata/test-fullvirt-serial-pty.xml | 9 ++++----- tests/xmconfigdata/test-fullvirt-serial-stdio.xml | 9 ++++----- .../test-fullvirt-serial-tcp-telnet.xml | 9 ++++----- tests/xmconfigdata/test-fullvirt-serial-tcp.xml | 9 ++++----- tests/xmconfigdata/test-fullvirt-serial-udp.xml | 9 ++++----- tests/xmconfigdata/test-fullvirt-serial-unix.xml | 9 ++++----- tests/xmconfigdata/test-fullvirt-sound.xml | 9 ++++----- tests/xmconfigdata/test-fullvirt-usbmouse.xml | 9 ++++----- tests/xmconfigdata/test-fullvirt-usbtablet.xml | 9 ++++----- tests/xmconfigdata/test-fullvirt-utc.xml | 9 ++++----- tests/xmconfigdata/test-no-source-cdrom.xml | 9 ++++----- tests/xmconfigdata/test-paravirt-maxvcpus.xml | 5 ++--- tests/xmconfigdata/test-paravirt-net-e1000.xml | 5 ++--- tests/xmconfigdata/test-paravirt-net-vifname.xml | 5 ++--- .../test-paravirt-new-pvfb-vncdisplay.xml | 5 ++--- tests/xmconfigdata/test-paravirt-new-pvfb.xml | 5 ++--- tests/xmconfigdata/test-paravirt-vcpu.xml | 5 ++--- tests/xmconfigdata/test-pci-devs.xml | 11 ++++++----- tests/xmconfigtest.c | 22 +++---------------= ---- 34 files changed, 125 insertions(+), 172 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 351745c8d..18a6672de 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 xmconfigtest xencapstest +test_programs +=3D xencapstest endif WITH_XEN =20 if WITH_LIBXL test_programs +=3D xlconfigtest xml2sexprtest sexpr2xmltest \ - libxlxml2domconfigtest + xmconfigtest libxlxml2domconfigtest test_libraries +=3D virmocklibxl.la endif WITH_LIBXL =20 @@ -501,18 +501,12 @@ if WITH_XEN xen_LDADDS =3D ../src/libvirt_driver_xen_impl.la xen_LDADDS +=3D $(LDADDS) =20 -xmconfigtest_SOURCES =3D \ - xmconfigtest.c testutilsxen.c testutilsxen.h \ - testutils.c testutils.h -xmconfigtest_LDADD =3D $(xen_LDADDS) - xencapstest_SOURCES =3D \ xencapstest.c testutils.h testutils.c xencapstest_LDADD =3D $(xen_LDADDS) =20 else ! WITH_XEN -EXTRA_DIST +=3D xmconfigtest.c xencapstest.c \ - testutilsxen.c testutilsxen.h +EXTRA_DIST +=3D xencapstest.c testutilsxen.c testutilsxen.h endif ! WITH_XEN =20 if WITH_LIBXL @@ -537,6 +531,11 @@ sexpr2xmltest_SOURCES =3D \ testutils.c testutils.h sexpr2xmltest_LDADD =3D $(libxl_LDADDS) =20 +xmconfigtest_SOURCES =3D \ + xmconfigtest.c testutilsxen.c testutilsxen.h \ + testutils.c testutils.h +xmconfigtest_LDADD =3D $(libxl_LDADDS) + libxlxml2domconfigtest_SOURCES =3D \ libxlxml2domconfigtest.c testutilsxen.c testutilsxen.h \ testutils.c testutils.h @@ -549,7 +548,7 @@ virmocklibxl_la_LIBADD =3D $(MOCKLIBS_LIBS) =20 else ! WITH_LIBXL EXTRA_DIST +=3D xlconfigtest.c xml2sexprtest.c sexpr2xmltest.c \ - libxlxml2domconfigtest.c + xmconfigtest.c libxlxml2domconfigtest.c endif ! WITH_LIBXL =20 QEMUMONITORTESTUTILS_SOURCES =3D \ diff --git a/tests/xmconfigdata/test-disk-drv-blktap-raw.xml b/tests/xmconf= igdata/test-disk-drv-blktap-raw.xml index cf859bad9..b8a1eafdd 100644 --- a/tests/xmconfigdata/test-disk-drv-blktap-raw.xml +++ b/tests/xmconfigdata/test-disk-drv-blktap-raw.xml @@ -6,7 +6,7 @@ 2 /usr/bin/pygrub - linux + linux destroy @@ -28,6 +28,5 @@ - diff --git a/tests/xmconfigdata/test-disk-drv-blktap2-raw.xml b/tests/xmcon= figdata/test-disk-drv-blktap2-raw.xml index af2519aa9..b47ee3eb1 100644 --- a/tests/xmconfigdata/test-disk-drv-blktap2-raw.xml +++ b/tests/xmconfigdata/test-disk-drv-blktap2-raw.xml @@ -6,7 +6,7 @@ 2 /usr/bin/pygrub - linux + linux destroy @@ -28,6 +28,5 @@ - diff --git a/tests/xmconfigdata/test-escape-paths.xml b/tests/xmconfigdata/= test-escape-paths.xml index a5daa2c3e..91d2b7c81 100644 --- a/tests/xmconfigdata/test-escape-paths.xml +++ b/tests/xmconfigdata/test-escape-paths.xml @@ -5,7 +5,7 @@ 403456 1 - hvm + hvm /usr/lib/xen/boot/hvmloader&test @@ -21,19 +21,19 @@ /usr/lib/xen/bin/qemu-dm&test - +
- +
- + @@ -54,8 +54,7 @@ - diff --git a/tests/xmconfigdata/test-fullvirt-default-feature.xml b/tests/x= mconfigdata/test-fullvirt-default-feature.xml index ce1280d79..e89047191 100644 --- a/tests/xmconfigdata/test-fullvirt-default-feature.xml +++ b/tests/xmconfigdata/test-fullvirt-default-feature.xml @@ -5,7 +5,7 @@ 403456 1 - hvm + hvm /usr/lib/xen/boot/hvmloader @@ -23,13 +23,13 @@ /usr/lib/xen/bin/qemu-dm - +
- + @@ -48,8 +48,7 @@ - diff --git a/tests/xmconfigdata/test-fullvirt-force-hpet.xml b/tests/xmconf= igdata/test-fullvirt-force-hpet.xml index ce1280d79..e89047191 100644 --- a/tests/xmconfigdata/test-fullvirt-force-hpet.xml +++ b/tests/xmconfigdata/test-fullvirt-force-hpet.xml @@ -5,7 +5,7 @@ 403456 1 - hvm + hvm /usr/lib/xen/boot/hvmloader @@ -23,13 +23,13 @@ /usr/lib/xen/bin/qemu-dm - +
- + @@ -48,8 +48,7 @@ - diff --git a/tests/xmconfigdata/test-fullvirt-force-nohpet.xml b/tests/xmco= nfigdata/test-fullvirt-force-nohpet.xml index 7636f31f0..d33a3f940 100644 --- a/tests/xmconfigdata/test-fullvirt-force-nohpet.xml +++ b/tests/xmconfigdata/test-fullvirt-force-nohpet.xml @@ -5,7 +5,7 @@ 403456 1 - hvm + hvm /usr/lib/xen/boot/hvmloader @@ -23,13 +23,13 @@ /usr/lib/xen/bin/qemu-dm - +
- + @@ -48,8 +48,7 @@ - diff --git a/tests/xmconfigdata/test-fullvirt-localtime.xml b/tests/xmconfi= gdata/test-fullvirt-localtime.xml index b3adf8664..fcc7dbcc3 100644 --- a/tests/xmconfigdata/test-fullvirt-localtime.xml +++ b/tests/xmconfigdata/test-fullvirt-localtime.xml @@ -5,7 +5,7 @@ 403456 1 - hvm + hvm /usr/lib/xen/boot/hvmloader @@ -21,13 +21,13 @@ /usr/lib/xen/bin/qemu-dm - +
- + @@ -46,8 +46,7 @@ - diff --git a/tests/xmconfigdata/test-fullvirt-net-netfront.xml b/tests/xmco= nfigdata/test-fullvirt-net-netfront.xml index c22ad8dee..5049c05f2 100644 --- a/tests/xmconfigdata/test-fullvirt-net-netfront.xml +++ b/tests/xmconfigdata/test-fullvirt-net-netfront.xml @@ -5,7 +5,7 @@ 403456 1 - hvm + hvm /usr/lib/xen/boot/hvmloader @@ -21,13 +21,13 @@ /usr/lib/xen/bin/qemu-dm - +
- + @@ -46,8 +46,7 @@ - diff --git a/tests/xmconfigdata/test-fullvirt-new-cdrom.xml b/tests/xmconfi= gdata/test-fullvirt-new-cdrom.xml index 2bb3d720b..6756960bf 100644 --- a/tests/xmconfigdata/test-fullvirt-new-cdrom.xml +++ b/tests/xmconfigdata/test-fullvirt-new-cdrom.xml @@ -5,7 +5,7 @@ 403456 1 - hvm + hvm /usr/lib/xen/boot/hvmloader @@ -21,13 +21,13 @@ /usr/lib/xen/bin/qemu-dm - +
- + @@ -46,8 +46,7 @@ - diff --git a/tests/xmconfigdata/test-fullvirt-nohap.xml b/tests/xmconfigdat= a/test-fullvirt-nohap.xml index 234856cde..a92d5c047 100644 --- a/tests/xmconfigdata/test-fullvirt-nohap.xml +++ b/tests/xmconfigdata/test-fullvirt-nohap.xml @@ -5,7 +5,7 @@ 403456 1 - hvm + hvm /usr/lib/xen/boot/hvmloader @@ -22,13 +22,13 @@ /usr/lib/xen/bin/qemu-dm - +
- + @@ -47,8 +47,7 @@ - diff --git a/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml b/tests/xmco= nfigdata/test-fullvirt-parallel-tcp.xml index be149fd3b..82464449c 100644 --- a/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml +++ b/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml @@ -5,7 +5,7 @@ 403456 1 - hvm + hvm /usr/lib/xen/boot/hvmloader @@ -21,13 +21,13 @@ /usr/lib/xen/bin/qemu-dm - +
- + @@ -51,8 +51,7 @@ - diff --git a/tests/xmconfigdata/test-fullvirt-serial-file.xml b/tests/xmcon= figdata/test-fullvirt-serial-file.xml index f27aba92b..2c2573783 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-file.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-file.xml @@ -5,7 +5,7 @@ 403456 1 - hvm + hvm /usr/lib/xen/boot/hvmloader @@ -21,13 +21,13 @@ /usr/lib/xen/bin/qemu-dm - +
- + @@ -54,8 +54,7 @@ - diff --git a/tests/xmconfigdata/test-fullvirt-serial-null.xml b/tests/xmcon= figdata/test-fullvirt-serial-null.xml index ea2994475..026f8da83 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-null.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-null.xml @@ -5,7 +5,7 @@ 403456 1 - hvm + hvm /usr/lib/xen/boot/hvmloader @@ -21,13 +21,13 @@ /usr/lib/xen/bin/qemu-dm - +
- + @@ -52,8 +52,7 @@ - diff --git a/tests/xmconfigdata/test-fullvirt-serial-pipe.xml b/tests/xmcon= figdata/test-fullvirt-serial-pipe.xml index 69bf51c28..d9ef787a6 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-pipe.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-pipe.xml @@ -5,7 +5,7 @@ 403456 1 - hvm + hvm /usr/lib/xen/boot/hvmloader @@ -21,13 +21,13 @@ /usr/lib/xen/bin/qemu-dm - +
- + @@ -54,8 +54,7 @@ - diff --git a/tests/xmconfigdata/test-fullvirt-serial-pty.xml b/tests/xmconf= igdata/test-fullvirt-serial-pty.xml index 0c6e47795..8a5af9331 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-pty.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-pty.xml @@ -5,7 +5,7 @@ 403456 1 - hvm + hvm /usr/lib/xen/boot/hvmloader @@ -21,13 +21,13 @@ /usr/lib/xen/bin/qemu-dm - +
- + @@ -52,8 +52,7 @@ - diff --git a/tests/xmconfigdata/test-fullvirt-serial-stdio.xml b/tests/xmco= nfigdata/test-fullvirt-serial-stdio.xml index 1f1208196..ddb1fd89d 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-stdio.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-stdio.xml @@ -5,7 +5,7 @@ 403456 1 - hvm + hvm /usr/lib/xen/boot/hvmloader @@ -21,13 +21,13 @@ /usr/lib/xen/bin/qemu-dm - +
- + @@ -52,8 +52,7 @@ - diff --git a/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml b/tests= /xmconfigdata/test-fullvirt-serial-tcp-telnet.xml index 47544df1d..a43333b47 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml @@ -5,7 +5,7 @@ 403456 1 - hvm + hvm /usr/lib/xen/boot/hvmloader @@ -21,13 +21,13 @@ /usr/lib/xen/bin/qemu-dm - +
- + @@ -56,8 +56,7 @@ - diff --git a/tests/xmconfigdata/test-fullvirt-serial-tcp.xml b/tests/xmconf= igdata/test-fullvirt-serial-tcp.xml index 8f1777aa5..5222ea12b 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-tcp.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-tcp.xml @@ -5,7 +5,7 @@ 403456 1 - hvm + hvm /usr/lib/xen/boot/hvmloader @@ -21,13 +21,13 @@ /usr/lib/xen/bin/qemu-dm - +
- + @@ -56,8 +56,7 @@ - diff --git a/tests/xmconfigdata/test-fullvirt-serial-udp.xml b/tests/xmconf= igdata/test-fullvirt-serial-udp.xml index c59e2b664..9862d4ff1 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-udp.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-udp.xml @@ -5,7 +5,7 @@ 403456 1 - hvm + hvm /usr/lib/xen/boot/hvmloader @@ -21,13 +21,13 @@ /usr/lib/xen/bin/qemu-dm - +
- + @@ -56,8 +56,7 @@ - diff --git a/tests/xmconfigdata/test-fullvirt-serial-unix.xml b/tests/xmcon= figdata/test-fullvirt-serial-unix.xml index e6787861d..2ff799241 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-unix.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-unix.xml @@ -5,7 +5,7 @@ 403456 1 - hvm + hvm /usr/lib/xen/boot/hvmloader @@ -21,13 +21,13 @@ /usr/lib/xen/bin/qemu-dm - +
- + @@ -54,8 +54,7 @@ - diff --git a/tests/xmconfigdata/test-fullvirt-sound.xml b/tests/xmconfigdat= a/test-fullvirt-sound.xml index 3bd2e76d8..67c762eba 100644 --- a/tests/xmconfigdata/test-fullvirt-sound.xml +++ b/tests/xmconfigdata/test-fullvirt-sound.xml @@ -5,7 +5,7 @@ 403456 1 - hvm + hvm /usr/lib/xen/boot/hvmloader @@ -21,13 +21,13 @@ /usr/lib/xen/bin/qemu-dm - +
- + @@ -48,8 +48,7 @@ - diff --git a/tests/xmconfigdata/test-fullvirt-usbmouse.xml b/tests/xmconfig= data/test-fullvirt-usbmouse.xml index f1421b673..1ef30cf51 100644 --- a/tests/xmconfigdata/test-fullvirt-usbmouse.xml +++ b/tests/xmconfigdata/test-fullvirt-usbmouse.xml @@ -5,7 +5,7 @@ 403456 1 - hvm + hvm /usr/lib/xen/boot/hvmloader @@ -21,13 +21,13 @@ /usr/lib/xen/bin/qemu-dm - +
- + @@ -47,8 +47,7 @@ - diff --git a/tests/xmconfigdata/test-fullvirt-usbtablet.xml b/tests/xmconfi= gdata/test-fullvirt-usbtablet.xml index 566c84261..d29e8f6c1 100644 --- a/tests/xmconfigdata/test-fullvirt-usbtablet.xml +++ b/tests/xmconfigdata/test-fullvirt-usbtablet.xml @@ -5,7 +5,7 @@ 403456 1 - hvm + hvm /usr/lib/xen/boot/hvmloader @@ -21,13 +21,13 @@ /usr/lib/xen/bin/qemu-dm - +
- + @@ -47,8 +47,7 @@ - diff --git a/tests/xmconfigdata/test-fullvirt-utc.xml b/tests/xmconfigdata/= test-fullvirt-utc.xml index 2bb3d720b..6756960bf 100644 --- a/tests/xmconfigdata/test-fullvirt-utc.xml +++ b/tests/xmconfigdata/test-fullvirt-utc.xml @@ -5,7 +5,7 @@ 403456 1 - hvm + hvm /usr/lib/xen/boot/hvmloader @@ -21,13 +21,13 @@ /usr/lib/xen/bin/qemu-dm - +
- + @@ -46,8 +46,7 @@ - diff --git a/tests/xmconfigdata/test-no-source-cdrom.xml b/tests/xmconfigda= ta/test-no-source-cdrom.xml index c0b2d4307..52f7775fe 100644 --- a/tests/xmconfigdata/test-no-source-cdrom.xml +++ b/tests/xmconfigdata/test-no-source-cdrom.xml @@ -5,7 +5,7 @@ 358400 1 - hvm + hvm /usr/lib/xen/boot/hvmloader @@ -21,13 +21,13 @@ /usr/lib/xen/bin/qemu-dm - +
- +
@@ -51,8 +51,7 @@ - diff --git a/tests/xmconfigdata/test-paravirt-maxvcpus.xml b/tests/xmconfig= data/test-paravirt-maxvcpus.xml index cd6574c6c..1ad652c4d 100644 --- a/tests/xmconfigdata/test-paravirt-maxvcpus.xml +++ b/tests/xmconfigdata/test-paravirt-maxvcpus.xml @@ -6,7 +6,7 @@ 4 /usr/bin/pygrub - linux + linux destroy @@ -14,7 +14,7 @@ restart - + @@ -28,6 +28,5 @@ - diff --git a/tests/xmconfigdata/test-paravirt-net-e1000.xml b/tests/xmconfi= gdata/test-paravirt-net-e1000.xml index 735e8b0ad..dd5dffdf5 100644 --- a/tests/xmconfigdata/test-paravirt-net-e1000.xml +++ b/tests/xmconfigdata/test-paravirt-net-e1000.xml @@ -6,7 +6,7 @@ 1 /usr/bin/pygrub - linux + linux destroy @@ -14,7 +14,7 @@ restart - + @@ -35,6 +35,5 @@ - diff --git a/tests/xmconfigdata/test-paravirt-net-vifname.xml b/tests/xmcon= figdata/test-paravirt-net-vifname.xml index 3ce3639e8..32006f967 100644 --- a/tests/xmconfigdata/test-paravirt-net-vifname.xml +++ b/tests/xmconfigdata/test-paravirt-net-vifname.xml @@ -6,7 +6,7 @@ 1 /usr/bin/pygrub - linux + linux destroy @@ -14,7 +14,7 @@ restart - + @@ -36,6 +36,5 @@ - diff --git a/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml b/tes= ts/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml index 20c31ecd5..b55cadd7c 100644 --- a/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml +++ b/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml @@ -6,7 +6,7 @@ 1 /usr/bin/pygrub - linux + linux destroy @@ -14,7 +14,7 @@ restart - + @@ -34,6 +34,5 @@ - diff --git a/tests/xmconfigdata/test-paravirt-new-pvfb.xml b/tests/xmconfig= data/test-paravirt-new-pvfb.xml index 33c48f42c..ffc00559f 100644 --- a/tests/xmconfigdata/test-paravirt-new-pvfb.xml +++ b/tests/xmconfigdata/test-paravirt-new-pvfb.xml @@ -6,7 +6,7 @@ 1 /usr/bin/pygrub - linux + linux destroy @@ -14,7 +14,7 @@ restart - + @@ -34,6 +34,5 @@ - diff --git a/tests/xmconfigdata/test-paravirt-vcpu.xml b/tests/xmconfigdata= /test-paravirt-vcpu.xml index cd6574c6c..1ad652c4d 100644 --- a/tests/xmconfigdata/test-paravirt-vcpu.xml +++ b/tests/xmconfigdata/test-paravirt-vcpu.xml @@ -6,7 +6,7 @@ 4 /usr/bin/pygrub - linux + linux destroy @@ -14,7 +14,7 @@ restart - + @@ -28,6 +28,5 @@ - diff --git a/tests/xmconfigdata/test-pci-devs.xml b/tests/xmconfigdata/test= -pci-devs.xml index 0faae4334..f39b1494e 100644 --- a/tests/xmconfigdata/test-pci-devs.xml +++ b/tests/xmconfigdata/test-pci-devs.xml @@ -5,7 +5,7 @@ 358400 1 - hvm + hvm /usr/lib/xen/boot/hvmloader @@ -21,13 +21,13 @@ /usr/lib/xen/bin/qemu-dm - +
- +
@@ -51,18 +51,19 @@ +
+
- diff --git a/tests/xmconfigtest.c b/tests/xmconfigtest.c index 90ccce0b0..6851fa73c 100644 --- a/tests/xmconfigtest.c +++ b/tests/xmconfigtest.c @@ -29,13 +29,12 @@ =20 #include "internal.h" #include "datatypes.h" -#include "xen/xen_driver.h" -#include "xen/xm_internal.h" #include "xenconfig/xen_xm.h" #include "testutils.h" #include "testutilsxen.h" #include "viralloc.h" #include "virstring.h" +#include "libxl/libxl_conf.h" =20 #define VIR_FROM_THIS VIR_FROM_NONE =20 @@ -50,7 +49,6 @@ testCompareParseXML(const char *xmcfg, const char *xml) int ret =3D -1; virConnectPtr conn =3D NULL; int wrote =3D 4096; - struct _xenUnifiedPrivate priv; virDomainDefPtr def =3D NULL; =20 if (VIR_ALLOC_N(gotxmcfgData, wrote) < 0) @@ -59,10 +57,6 @@ testCompareParseXML(const char *xmcfg, const char *xml) conn =3D virGetConnect(); if (!conn) goto fail; =20 - /* Many puppies died to bring you this code. */ - priv.caps =3D caps; - conn->privateData =3D &priv; - if (!(def =3D virDomainDefParseFile(xml, caps, xmlopt, NULL, VIR_DOMAIN_DEF_PARSE_INACTIVE))) goto fail; @@ -101,20 +95,11 @@ testCompareFormatXML(const char *xmcfg, const char *xm= l) char *gotxml =3D NULL; virConfPtr conf =3D NULL; int ret =3D -1; - virConnectPtr conn; - struct _xenUnifiedPrivate priv; virDomainDefPtr def =3D NULL; =20 - conn =3D virGetConnect(); - if (!conn) goto fail; - if (virTestLoadFile(xmcfg, &xmcfgData) < 0) goto fail; =20 - /* Many puppies died to bring you this code. */ - priv.caps =3D caps; - conn->privateData =3D &priv; - if (!(conf =3D virConfReadString(xmcfgData, 0))) goto fail; =20 @@ -135,7 +120,6 @@ testCompareFormatXML(const char *xmcfg, const char *xml) VIR_FREE(xmcfgData); VIR_FREE(gotxml); virDomainDefFree(def); - virObjectUnref(conn); =20 return ret; } @@ -180,10 +164,10 @@ mymain(void) { int ret =3D 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 #define DO_TEST_PARSE(name) \ --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list