diff options
| author | Guido Günther <agx@sigxcpu.org> | 2015-01-22 11:14:15 +0100 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2015-01-22 11:14:15 +0100 |
| commit | 7b59a26ddabc57815755a8a80e646ac388d94b0c (patch) | |
| tree | ac53c8bbff30012014083fa04b0f4f389d4cea85 /tests | |
| parent | 0b196d9971e7bde88594b686c55a819237dfa2de (diff) | |
New upstream version 1.2.12~rc1
Diffstat (limited to 'tests')
86 files changed, 1474 insertions, 266 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index e9418ea74..b16d3d5a4 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -138,6 +138,7 @@ EXTRA_DIST = \ vmx2xmldata \ xencapsdata \ xmconfigdata \ + xlconfigdata \ xml2sexprdata \ xml2vmxdata \ vmwareverdata \ @@ -227,6 +228,11 @@ if WITH_XEN test_programs += xml2sexprtest sexpr2xmltest \ xmconfigtest xencapstest statstest reconnect endif WITH_XEN + +if WITH_LIBXL +test_programs += xlconfigtest +endif WITH_LIBXL + if WITH_QEMU test_programs += qemuxml2argvtest qemuxml2xmltest qemuxmlnstest \ qemuargv2xmltest qemuhelptest domainsnapshotxml2xmltest \ @@ -477,6 +483,11 @@ sexpr2xmltest_SOURCES = \ testutils.c testutils.h sexpr2xmltest_LDADD = $(xen_LDADDS) +xlconfigtest_SOURCES = \ + xlconfigtest.c testutilsxen.c testutilsxen.h \ + testutils.c testutils.h +xlconfigtest_LDADD =$(xen_LDADDS) + xmconfigtest_SOURCES = \ xmconfigtest.c testutilsxen.c testutilsxen.h \ testutils.c testutils.h diff --git a/tests/Makefile.in b/tests/Makefile.in index 39edc9442..c832e980d 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -104,36 +104,37 @@ host_triplet = @host@ @WITH_XEN_TRUE@am__append_12 = xml2sexprtest sexpr2xmltest \ @WITH_XEN_TRUE@ xmconfigtest xencapstest statstest reconnect -@WITH_QEMU_TRUE@am__append_13 = qemuxml2argvtest qemuxml2xmltest qemuxmlnstest \ +@WITH_LIBXL_TRUE@am__append_13 = xlconfigtest +@WITH_QEMU_TRUE@am__append_14 = qemuxml2argvtest qemuxml2xmltest qemuxmlnstest \ @WITH_QEMU_TRUE@ qemuargv2xmltest qemuhelptest domainsnapshotxml2xmltest \ @WITH_QEMU_TRUE@ qemumonitortest qemumonitorjsontest qemuhotplugtest \ @WITH_QEMU_TRUE@ qemuagenttest qemucapabilitiestest qemucaps2xmltest -@WITH_LXC_TRUE@am__append_14 = lxcxml2xmltest lxcconf2xmltest -@WITH_OPENVZ_TRUE@am__append_15 = openvzutilstest -@WITH_ESX_TRUE@am__append_16 = esxutilstest -@WITH_VBOX_TRUE@am__append_17 = vboxsnapshotxmltest -@WITH_VMX_TRUE@am__append_18 = vmx2xmltest xml2vmxtest -@WITH_VMWARE_TRUE@am__append_19 = vmwarevertest -@WITH_BHYVE_TRUE@am__append_20 = bhyvexml2argvtest bhyvexml2xmltest -@WITH_CIL_TRUE@am__append_21 = objectlocking -@WITH_YAJL_TRUE@am__append_22 = jsontest -@WITH_NETWORK_TRUE@am__append_23 = \ +@WITH_LXC_TRUE@am__append_15 = lxcxml2xmltest lxcconf2xmltest +@WITH_OPENVZ_TRUE@am__append_16 = openvzutilstest +@WITH_ESX_TRUE@am__append_17 = esxutilstest +@WITH_VBOX_TRUE@am__append_18 = vboxsnapshotxmltest +@WITH_VMX_TRUE@am__append_19 = vmx2xmltest xml2vmxtest +@WITH_VMWARE_TRUE@am__append_20 = vmwarevertest +@WITH_BHYVE_TRUE@am__append_21 = bhyvexml2argvtest bhyvexml2xmltest +@WITH_CIL_TRUE@am__append_22 = objectlocking +@WITH_YAJL_TRUE@am__append_23 = jsontest +@WITH_NETWORK_TRUE@am__append_24 = \ @WITH_NETWORK_TRUE@ networkxml2conftest \ @WITH_NETWORK_TRUE@ networkxml2firewalltest \ @WITH_NETWORK_TRUE@ $(NULL) -@WITH_STORAGE_SHEEPDOG_TRUE@am__append_24 = storagebackendsheepdogtest -@WITH_NWFILTER_TRUE@am__append_25 = nwfilterebiptablestest \ +@WITH_STORAGE_SHEEPDOG_TRUE@am__append_25 = storagebackendsheepdogtest +@WITH_NWFILTER_TRUE@am__append_26 = nwfilterebiptablestest \ @WITH_NWFILTER_TRUE@ nwfilterxml2firewalltest -@WITH_STORAGE_TRUE@am__append_26 = storagevolxml2argvtest -@WITH_STORAGE_FS_TRUE@am__append_27 = virstoragetest -@WITH_LINUX_TRUE@am__append_28 = virscsitest -@WITH_LINUX_TRUE@am__append_29 = virusbtest \ +@WITH_STORAGE_TRUE@am__append_27 = storagevolxml2argvtest +@WITH_STORAGE_FS_TRUE@am__append_28 = virstoragetest +@WITH_LINUX_TRUE@am__append_29 = virscsitest +@WITH_LINUX_TRUE@am__append_30 = virusbtest \ @WITH_LINUX_TRUE@ virnetdevbandwidthtest \ @WITH_LINUX_TRUE@ $(NULL) -@WITH_LIBVIRTD_TRUE@am__append_30 = \ +@WITH_LIBVIRTD_TRUE@am__append_31 = \ @WITH_LIBVIRTD_TRUE@ test_conf.sh \ @WITH_LIBVIRTD_TRUE@ cpuset \ @WITH_LIBVIRTD_TRUE@ define-dev-segfault \ @@ -152,11 +153,11 @@ host_triplet = @host@ @WITH_LIBVIRTD_TRUE@ virsh-undefine \ @WITH_LIBVIRTD_TRUE@ $(NULL) -@WITH_LIBVIRTD_TRUE@am__append_31 = \ +@WITH_LIBVIRTD_TRUE@am__append_32 = \ @WITH_LIBVIRTD_TRUE@ eventtest \ @WITH_LIBVIRTD_TRUE@ libvirtdconftest -@WITH_LIBVIRTD_FALSE@am__append_32 = \ +@WITH_LIBVIRTD_FALSE@am__append_33 = \ @WITH_LIBVIRTD_FALSE@ test_conf.sh \ @WITH_LIBVIRTD_FALSE@ cpuset \ @WITH_LIBVIRTD_FALSE@ define-dev-segfault \ @@ -174,31 +175,31 @@ host_triplet = @host@ @WITH_LIBVIRTD_FALSE@ virsh-undefine \ @WITH_LIBVIRTD_FALSE@ $(NULL) -@WITH_SECDRIVER_APPARMOR_TRUE@am__append_33 = virt-aa-helper-test -@WITH_SECDRIVER_APPARMOR_FALSE@am__append_34 = virt-aa-helper-test -@WITH_QEMU_TRUE@am__append_35 = libqemumonitortestutils.la \ +@WITH_SECDRIVER_APPARMOR_TRUE@am__append_34 = virt-aa-helper-test +@WITH_SECDRIVER_APPARMOR_FALSE@am__append_35 = virt-aa-helper-test +@WITH_QEMU_TRUE@am__append_36 = libqemumonitortestutils.la \ @WITH_QEMU_TRUE@ qemuxml2argvmock.la \ @WITH_QEMU_TRUE@ $(NULL) -@WITH_BHYVE_TRUE@am__append_36 = bhyvexml2argvmock.la -@WITH_DBUS_TRUE@am__append_37 = \ +@WITH_BHYVE_TRUE@am__append_37 = bhyvexml2argvmock.la +@WITH_DBUS_TRUE@am__append_38 = \ @WITH_DBUS_TRUE@ virmockdbus.la -@WITH_LINUX_TRUE@am__append_38 = virusbmock.la \ +@WITH_LINUX_TRUE@am__append_39 = virusbmock.la \ @WITH_LINUX_TRUE@ virnetdevbandwidthmock.la \ @WITH_LINUX_TRUE@ $(NULL) -@WITH_TESTS_TRUE@noinst_PROGRAMS = $(am__EXEEXT_29) $(am__EXEEXT_30) -@WITH_TESTS_FALSE@check_PROGRAMS = $(am__EXEEXT_29) $(am__EXEEXT_30) -TESTS = $(am__EXEEXT_29) $(am__EXEEXT_32) -@WITH_XEN_FALSE@am__append_39 = xml2sexprtest.c sexpr2xmltest.c xmconfigtest.c \ +@WITH_TESTS_TRUE@noinst_PROGRAMS = $(am__EXEEXT_30) $(am__EXEEXT_31) +@WITH_TESTS_FALSE@check_PROGRAMS = $(am__EXEEXT_30) $(am__EXEEXT_31) +TESTS = $(am__EXEEXT_30) $(am__EXEEXT_33) +@WITH_XEN_FALSE@am__append_40 = xml2sexprtest.c sexpr2xmltest.c xmconfigtest.c \ @WITH_XEN_FALSE@ xencapstest.c reconnect.c \ @WITH_XEN_FALSE@ testutilsxen.c testutilsxen.h -@WITH_NETWORK_TRUE@@WITH_QEMU_TRUE@am__append_40 = ../src/libvirt_driver_network_impl.la -@WITH_QEMU_TRUE@@WITH_STORAGE_TRUE@am__append_41 = ../src/libvirt_driver_storage_impl.la -@WITH_DTRACE_PROBES_TRUE@@WITH_QEMU_TRUE@am__append_42 = ../src/libvirt_qemu_probes.lo -@WITH_QEMU_FALSE@am__append_43 = qemuxml2argvtest.c qemuxml2xmltest.c qemuargv2xmltest.c \ +@WITH_NETWORK_TRUE@@WITH_QEMU_TRUE@am__append_41 = ../src/libvirt_driver_network_impl.la +@WITH_QEMU_TRUE@@WITH_STORAGE_TRUE@am__append_42 = ../src/libvirt_driver_storage_impl.la +@WITH_DTRACE_PROBES_TRUE@@WITH_QEMU_TRUE@am__append_43 = ../src/libvirt_qemu_probes.lo +@WITH_QEMU_FALSE@am__append_44 = qemuxml2argvtest.c qemuxml2xmltest.c qemuargv2xmltest.c \ @WITH_QEMU_FALSE@ qemuxmlnstest.c qemuhelptest.c domainsnapshotxml2xmltest.c \ @WITH_QEMU_FALSE@ qemumonitortest.c testutilsqemu.c testutilsqemu.h \ @WITH_QEMU_FALSE@ qemumonitorjsontest.c qemuhotplugtest.c \ @@ -206,41 +207,41 @@ TESTS = $(am__EXEEXT_29) $(am__EXEEXT_32) @WITH_QEMU_FALSE@ qemucaps2xmltest.c \ @WITH_QEMU_FALSE@ $(QEMUMONITORTESTUTILS_SOURCES) -@WITH_LXC_TRUE@@WITH_NETWORK_TRUE@am__append_44 = ../src/libvirt_driver_network_impl.la -@WITH_LXC_FALSE@am__append_45 = lxcxml2xmltest.c testutilslxc.c testutilslxc.h -@WITH_OPENVZ_FALSE@am__append_46 = openvzutilstest.c -@WITH_ESX_FALSE@am__append_47 = esxutilstest.c -@WITH_VBOX_FALSE@am__append_48 = vboxsnapshotxmltest.c -@WITH_VMX_FALSE@am__append_49 = vmx2xmltest.c xml2vmxtest.c -@WITH_VMWARE_FALSE@am__append_50 = vmwarevertest.c -@WITH_BHYVE_TRUE@@WITH_STORAGE_TRUE@am__append_51 = ../src/libvirt_driver_storage_impl.la -@WITH_BHYVE_FALSE@am__append_52 = bhyvexml2argvtest.c bhyvexml2xmltest.c bhyvexml2argvmock.c -@WITH_NETWORK_FALSE@am__append_53 = networkxml2conftest.c -@WITH_STORAGE_SHEEPDOG_FALSE@am__append_54 = storagebackendsheepdogtest.c -@WITH_STORAGE_FALSE@am__append_55 = storagevolxml2argvtest.c -@WITH_QEMU_TRUE@am__append_56 = testutilsqemu.c testutilsqemu.h -@WITH_QEMU_TRUE@am__append_57 = $(qemu_LDADDS) $(GNULIB_LIBS) -@WITH_LIBVIRTD_FALSE@am__append_58 = libvirtdconftest.c -@HAVE_LIBTASN1_TRUE@@WITH_GNUTLS_TRUE@am__append_59 = pkix_asn1_tab.c -@HAVE_LIBTASN1_TRUE@@WITH_GNUTLS_TRUE@am__append_60 = -ltasn1 -@HAVE_LIBTASN1_TRUE@@WITH_GNUTLS_TRUE@am__append_61 = pkix_asn1_tab.c -@HAVE_LIBTASN1_TRUE@@WITH_GNUTLS_TRUE@am__append_62 = -ltasn1 -@HAVE_LIBTASN1_FALSE@@WITH_GNUTLS_TRUE@am__append_63 = pkix_asn1_tab.c -@WITH_GNUTLS_FALSE@am__append_64 = \ +@WITH_LXC_TRUE@@WITH_NETWORK_TRUE@am__append_45 = ../src/libvirt_driver_network_impl.la +@WITH_LXC_FALSE@am__append_46 = lxcxml2xmltest.c testutilslxc.c testutilslxc.h +@WITH_OPENVZ_FALSE@am__append_47 = openvzutilstest.c +@WITH_ESX_FALSE@am__append_48 = esxutilstest.c +@WITH_VBOX_FALSE@am__append_49 = vboxsnapshotxmltest.c +@WITH_VMX_FALSE@am__append_50 = vmx2xmltest.c xml2vmxtest.c +@WITH_VMWARE_FALSE@am__append_51 = vmwarevertest.c +@WITH_BHYVE_TRUE@@WITH_STORAGE_TRUE@am__append_52 = ../src/libvirt_driver_storage_impl.la +@WITH_BHYVE_FALSE@am__append_53 = bhyvexml2argvtest.c bhyvexml2xmltest.c bhyvexml2argvmock.c +@WITH_NETWORK_FALSE@am__append_54 = networkxml2conftest.c +@WITH_STORAGE_SHEEPDOG_FALSE@am__append_55 = storagebackendsheepdogtest.c +@WITH_STORAGE_FALSE@am__append_56 = storagevolxml2argvtest.c +@WITH_QEMU_TRUE@am__append_57 = testutilsqemu.c testutilsqemu.h +@WITH_QEMU_TRUE@am__append_58 = $(qemu_LDADDS) $(GNULIB_LIBS) +@WITH_LIBVIRTD_FALSE@am__append_59 = libvirtdconftest.c +@HAVE_LIBTASN1_TRUE@@WITH_GNUTLS_TRUE@am__append_60 = pkix_asn1_tab.c +@HAVE_LIBTASN1_TRUE@@WITH_GNUTLS_TRUE@am__append_61 = -ltasn1 +@HAVE_LIBTASN1_TRUE@@WITH_GNUTLS_TRUE@am__append_62 = pkix_asn1_tab.c +@HAVE_LIBTASN1_TRUE@@WITH_GNUTLS_TRUE@am__append_63 = -ltasn1 +@HAVE_LIBTASN1_FALSE@@WITH_GNUTLS_TRUE@am__append_64 = pkix_asn1_tab.c +@WITH_GNUTLS_FALSE@am__append_65 = \ @WITH_GNUTLS_FALSE@ virnettlscontexttest.c virnettlssessiontest.c \ @WITH_GNUTLS_FALSE@ virnettlshelpers.h virnettlshelpers.c \ @WITH_GNUTLS_FALSE@ testutils.h testutils.c pkix_asn1_tab.c -@WITH_SELINUX_TRUE@am__append_65 = $(SELINUX_LIBS) +@WITH_SELINUX_TRUE@am__append_66 = $(SELINUX_LIBS) @WITH_SELINUX_FALSE@viridentitytest_DEPENDENCIES = \ @WITH_SELINUX_FALSE@ $(am__DEPENDENCIES_2) \ @WITH_SELINUX_FALSE@ $(am__DEPENDENCIES_6) -@WITH_DBUS_FALSE@am__append_66 = virdbustest.c virmockdbus.c virsystemdtest.c -@WITH_ATTR_TRUE@@WITH_SECDRIVER_SELINUX_TRUE@@WITH_TESTS_TRUE@am__append_67 = libsecurityselinuxhelper.la -@WITH_ATTR_TRUE@@WITH_SECDRIVER_SELINUX_TRUE@@WITH_TESTS_FALSE@am__append_68 = libsecurityselinuxhelper.la -@WITH_LINUX_FALSE@am__append_69 = fchosttest.c scsihosttest.c \ +@WITH_DBUS_FALSE@am__append_67 = virdbustest.c virmockdbus.c virsystemdtest.c +@WITH_ATTR_TRUE@@WITH_SECDRIVER_SELINUX_TRUE@@WITH_TESTS_TRUE@am__append_68 = libsecurityselinuxhelper.la +@WITH_ATTR_TRUE@@WITH_SECDRIVER_SELINUX_TRUE@@WITH_TESTS_FALSE@am__append_69 = libsecurityselinuxhelper.la +@WITH_LINUX_FALSE@am__append_70 = fchosttest.c scsihosttest.c \ @WITH_LINUX_FALSE@ virscsitest.c -@WITH_CIL_FALSE@am__append_70 = objectlocking.ml +@WITH_CIL_FALSE@am__append_71 = objectlocking.ml subdir = tests DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/build-aux/mkinstalldirs \ @@ -561,7 +562,8 @@ virusbmock_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ @WITH_XEN_TRUE@ sexpr2xmltest$(EXEEXT) xmconfigtest$(EXEEXT) \ @WITH_XEN_TRUE@ xencapstest$(EXEEXT) statstest$(EXEEXT) \ @WITH_XEN_TRUE@ reconnect$(EXEEXT) -@WITH_QEMU_TRUE@am__EXEEXT_11 = qemuxml2argvtest$(EXEEXT) \ +@WITH_LIBXL_TRUE@am__EXEEXT_11 = xlconfigtest$(EXEEXT) +@WITH_QEMU_TRUE@am__EXEEXT_12 = qemuxml2argvtest$(EXEEXT) \ @WITH_QEMU_TRUE@ qemuxml2xmltest$(EXEEXT) \ @WITH_QEMU_TRUE@ qemuxmlnstest$(EXEEXT) \ @WITH_QEMU_TRUE@ qemuargv2xmltest$(EXEEXT) \ @@ -573,31 +575,31 @@ virusbmock_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ @WITH_QEMU_TRUE@ qemuagenttest$(EXEEXT) \ @WITH_QEMU_TRUE@ qemucapabilitiestest$(EXEEXT) \ @WITH_QEMU_TRUE@ qemucaps2xmltest$(EXEEXT) -@WITH_LXC_TRUE@am__EXEEXT_12 = lxcxml2xmltest$(EXEEXT) \ +@WITH_LXC_TRUE@am__EXEEXT_13 = lxcxml2xmltest$(EXEEXT) \ @WITH_LXC_TRUE@ lxcconf2xmltest$(EXEEXT) -@WITH_OPENVZ_TRUE@am__EXEEXT_13 = openvzutilstest$(EXEEXT) -@WITH_ESX_TRUE@am__EXEEXT_14 = esxutilstest$(EXEEXT) -@WITH_VBOX_TRUE@am__EXEEXT_15 = vboxsnapshotxmltest$(EXEEXT) -@WITH_VMX_TRUE@am__EXEEXT_16 = vmx2xmltest$(EXEEXT) \ +@WITH_OPENVZ_TRUE@am__EXEEXT_14 = openvzutilstest$(EXEEXT) +@WITH_ESX_TRUE@am__EXEEXT_15 = esxutilstest$(EXEEXT) +@WITH_VBOX_TRUE@am__EXEEXT_16 = vboxsnapshotxmltest$(EXEEXT) +@WITH_VMX_TRUE@am__EXEEXT_17 = vmx2xmltest$(EXEEXT) \ @WITH_VMX_TRUE@ xml2vmxtest$(EXEEXT) -@WITH_VMWARE_TRUE@am__EXEEXT_17 = vmwarevertest$(EXEEXT) -@WITH_BHYVE_TRUE@am__EXEEXT_18 = bhyvexml2argvtest$(EXEEXT) \ +@WITH_VMWARE_TRUE@am__EXEEXT_18 = vmwarevertest$(EXEEXT) +@WITH_BHYVE_TRUE@am__EXEEXT_19 = bhyvexml2argvtest$(EXEEXT) \ @WITH_BHYVE_TRUE@ bhyvexml2xmltest$(EXEEXT) -@WITH_CIL_TRUE@am__EXEEXT_19 = objectlocking$(EXEEXT) -@WITH_YAJL_TRUE@am__EXEEXT_20 = jsontest$(EXEEXT) -@WITH_NETWORK_TRUE@am__EXEEXT_21 = networkxml2conftest$(EXEEXT) \ +@WITH_CIL_TRUE@am__EXEEXT_20 = objectlocking$(EXEEXT) +@WITH_YAJL_TRUE@am__EXEEXT_21 = jsontest$(EXEEXT) +@WITH_NETWORK_TRUE@am__EXEEXT_22 = networkxml2conftest$(EXEEXT) \ @WITH_NETWORK_TRUE@ networkxml2firewalltest$(EXEEXT) -@WITH_STORAGE_SHEEPDOG_TRUE@am__EXEEXT_22 = storagebackendsheepdogtest$(EXEEXT) -@WITH_NWFILTER_TRUE@am__EXEEXT_23 = nwfilterebiptablestest$(EXEEXT) \ +@WITH_STORAGE_SHEEPDOG_TRUE@am__EXEEXT_23 = storagebackendsheepdogtest$(EXEEXT) +@WITH_NWFILTER_TRUE@am__EXEEXT_24 = nwfilterebiptablestest$(EXEEXT) \ @WITH_NWFILTER_TRUE@ nwfilterxml2firewalltest$(EXEEXT) -@WITH_STORAGE_TRUE@am__EXEEXT_24 = storagevolxml2argvtest$(EXEEXT) -@WITH_STORAGE_FS_TRUE@am__EXEEXT_25 = virstoragetest$(EXEEXT) -@WITH_LINUX_TRUE@am__EXEEXT_26 = virscsitest$(EXEEXT) -@WITH_LINUX_TRUE@am__EXEEXT_27 = virusbtest$(EXEEXT) \ +@WITH_STORAGE_TRUE@am__EXEEXT_25 = storagevolxml2argvtest$(EXEEXT) +@WITH_STORAGE_FS_TRUE@am__EXEEXT_26 = virstoragetest$(EXEEXT) +@WITH_LINUX_TRUE@am__EXEEXT_27 = virscsitest$(EXEEXT) +@WITH_LINUX_TRUE@am__EXEEXT_28 = virusbtest$(EXEEXT) \ @WITH_LINUX_TRUE@ virnetdevbandwidthtest$(EXEEXT) -@WITH_LIBVIRTD_TRUE@am__EXEEXT_28 = eventtest$(EXEEXT) \ +@WITH_LIBVIRTD_TRUE@am__EXEEXT_29 = eventtest$(EXEEXT) \ @WITH_LIBVIRTD_TRUE@ libvirtdconftest$(EXEEXT) -am__EXEEXT_29 = virshtest$(EXEEXT) sockettest$(EXEEXT) \ +am__EXEEXT_30 = virshtest$(EXEEXT) sockettest$(EXEEXT) \ nodeinfotest$(EXEEXT) virbuftest$(EXEEXT) commandtest$(EXEEXT) \ seclabeltest$(EXEEXT) virhashtest$(EXEEXT) \ viratomictest$(EXEEXT) utiltest$(EXEEXT) shunloadtest$(EXEEXT) \ @@ -619,16 +621,16 @@ am__EXEEXT_29 = virshtest$(EXEEXT) sockettest$(EXEEXT) \ $(am__EXEEXT_10) $(am__EXEEXT_11) $(am__EXEEXT_12) \ $(am__EXEEXT_13) $(am__EXEEXT_14) $(am__EXEEXT_15) \ $(am__EXEEXT_16) $(am__EXEEXT_17) $(am__EXEEXT_18) \ - $(am__EXEEXT_19) $(am__EXEEXT_20) networkxml2xmltest$(EXEEXT) \ - networkxml2xmlupdatetest$(EXEEXT) $(am__EXEEXT_21) \ - $(am__EXEEXT_22) nwfilterxml2xmltest$(EXEEXT) $(am__EXEEXT_23) \ + $(am__EXEEXT_19) $(am__EXEEXT_20) $(am__EXEEXT_21) \ + networkxml2xmltest$(EXEEXT) networkxml2xmlupdatetest$(EXEEXT) \ + $(am__EXEEXT_22) $(am__EXEEXT_23) nwfilterxml2xmltest$(EXEEXT) \ $(am__EXEEXT_24) $(am__EXEEXT_25) $(am__EXEEXT_26) \ - storagevolxml2xmltest$(EXEEXT) storagepoolxml2xmltest$(EXEEXT) \ - nodedevxml2xmltest$(EXEEXT) interfacexml2xmltest$(EXEEXT) \ - cputest$(EXEEXT) metadatatest$(EXEEXT) \ - secretxml2xmltest$(EXEEXT) $(am__EXEEXT_27) $(am__EXEEXT_28) \ - objecteventtest$(EXEEXT) -am__EXEEXT_30 = commandhelper$(EXEEXT) ssh$(EXEEXT) test_conf$(EXEEXT) + $(am__EXEEXT_27) storagevolxml2xmltest$(EXEEXT) \ + storagepoolxml2xmltest$(EXEEXT) nodedevxml2xmltest$(EXEEXT) \ + interfacexml2xmltest$(EXEEXT) cputest$(EXEEXT) \ + metadatatest$(EXEEXT) secretxml2xmltest$(EXEEXT) \ + $(am__EXEEXT_28) $(am__EXEEXT_29) objecteventtest$(EXEEXT) +am__EXEEXT_31 = commandhelper$(EXEEXT) ssh$(EXEEXT) test_conf$(EXEEXT) PROGRAMS = $(noinst_PROGRAMS) am__bhyvexml2argvtest_SOURCES_DIST = bhyvexml2argvtest.c testutils.c \ testutils.h @@ -641,7 +643,7 @@ am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(PROBES_O) $(GNULIB_LIBS) ../src/libvirt.la @WITH_BHYVE_TRUE@am__DEPENDENCIES_3 = \ @WITH_BHYVE_TRUE@ ../src/libvirt_driver_bhyve_impl.la \ -@WITH_BHYVE_TRUE@ $(am__append_51) $(am__DEPENDENCIES_2) +@WITH_BHYVE_TRUE@ $(am__append_52) $(am__DEPENDENCIES_2) @WITH_BHYVE_TRUE@bhyvexml2argvtest_DEPENDENCIES = \ @WITH_BHYVE_TRUE@ $(am__DEPENDENCIES_3) am__bhyvexml2xmltest_SOURCES_DIST = bhyvexml2xmltest.c testutils.c \ @@ -672,7 +674,7 @@ am__domaincapstest_SOURCES_DIST = domaincapstest.c testutils.h \ am_domaincapstest_OBJECTS = domaincapstest.$(OBJEXT) \ testutils.$(OBJEXT) $(am__objects_2) domaincapstest_OBJECTS = $(am_domaincapstest_OBJECTS) -domaincapstest_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__append_57) +domaincapstest_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__append_58) am_domainconftest_OBJECTS = domainconftest.$(OBJEXT) \ testutils.$(OBJEXT) domainconftest_OBJECTS = $(am_domainconftest_OBJECTS) @@ -727,7 +729,7 @@ am__lxcconf2xmltest_SOURCES_DIST = lxcconf2xmltest.c testutils.c \ @WITH_LXC_TRUE@ testutils.$(OBJEXT) lxcconf2xmltest_OBJECTS = $(am_lxcconf2xmltest_OBJECTS) @WITH_LXC_TRUE@am__DEPENDENCIES_4 = ../src/libvirt_driver_lxc_impl.la \ -@WITH_LXC_TRUE@ $(am__append_44) $(am__DEPENDENCIES_2) +@WITH_LXC_TRUE@ $(am__append_45) $(am__DEPENDENCIES_2) @WITH_LXC_TRUE@lxcconf2xmltest_DEPENDENCIES = $(am__DEPENDENCIES_4) am__lxcxml2xmltest_SOURCES_DIST = lxcxml2xmltest.c testutilslxc.c \ testutilslxc.h testutils.c testutils.h @@ -1216,6 +1218,12 @@ am__xencapstest_SOURCES_DIST = xencapstest.c testutils.h testutils.c @WITH_XEN_TRUE@ testutils.$(OBJEXT) xencapstest_OBJECTS = $(am_xencapstest_OBJECTS) @WITH_XEN_TRUE@xencapstest_DEPENDENCIES = $(am__DEPENDENCIES_5) +am__xlconfigtest_SOURCES_DIST = xlconfigtest.c testutilsxen.c \ + testutilsxen.h testutils.c testutils.h +@WITH_XEN_TRUE@am_xlconfigtest_OBJECTS = xlconfigtest.$(OBJEXT) \ +@WITH_XEN_TRUE@ testutilsxen.$(OBJEXT) testutils.$(OBJEXT) +xlconfigtest_OBJECTS = $(am_xlconfigtest_OBJECTS) +@WITH_XEN_TRUE@xlconfigtest_DEPENDENCIES = $(am__DEPENDENCIES_5) am__xmconfigtest_SOURCES_DIST = xmconfigtest.c testutilsxen.c \ testutilsxen.h testutils.c testutils.h @WITH_XEN_TRUE@am_xmconfigtest_OBJECTS = xmconfigtest.$(OBJEXT) \ @@ -1331,8 +1339,9 @@ SOURCES = $(bhyvexml2argvmock_la_SOURCES) \ $(virsystemdtest_SOURCES) $(virtimetest_SOURCES) \ $(viruritest_SOURCES) $(virusbtest_SOURCES) \ $(vmwarevertest_SOURCES) $(vmx2xmltest_SOURCES) \ - $(xencapstest_SOURCES) $(xmconfigtest_SOURCES) \ - $(xml2sexprtest_SOURCES) $(xml2vmxtest_SOURCES) + $(xencapstest_SOURCES) $(xlconfigtest_SOURCES) \ + $(xmconfigtest_SOURCES) $(xml2sexprtest_SOURCES) \ + $(xml2vmxtest_SOURCES) DIST_SOURCES = $(am__bhyvexml2argvmock_la_SOURCES_DIST) \ $(am__libqemumonitortestutils_la_SOURCES_DIST) \ $(am__libsecurityselinuxhelper_la_SOURCES_DIST) \ @@ -1414,6 +1423,7 @@ DIST_SOURCES = $(am__bhyvexml2argvmock_la_SOURCES_DIST) \ $(am__vmwarevertest_SOURCES_DIST) \ $(am__vmx2xmltest_SOURCES_DIST) \ $(am__xencapstest_SOURCES_DIST) \ + $(am__xlconfigtest_SOURCES_DIST) \ $(am__xmconfigtest_SOURCES_DIST) \ $(am__xml2sexprtest_SOURCES_DIST) \ $(am__xml2vmxtest_SOURCES_DIST) @@ -1625,18 +1635,18 @@ am__set_TESTS_bases = \ bases=`echo $$bases` RECHECK_LOGS = $(TEST_LOGS) AM_RECURSIVE_TARGETS = check recheck -@WITH_LIBVIRTD_TRUE@am__EXEEXT_31 = test_conf.sh cpuset \ +@WITH_LIBVIRTD_TRUE@am__EXEEXT_32 = test_conf.sh cpuset \ @WITH_LIBVIRTD_TRUE@ define-dev-segfault int-overflow \ @WITH_LIBVIRTD_TRUE@ libvirtd-fail libvirtd-pool read-bufsiz \ @WITH_LIBVIRTD_TRUE@ read-non-seekable start \ @WITH_LIBVIRTD_TRUE@ virsh-uriprecedence vcpupin virsh-all \ @WITH_LIBVIRTD_TRUE@ virsh-optparse virsh-schedinfo \ @WITH_LIBVIRTD_TRUE@ virsh-synopsis virsh-undefine -am__EXEEXT_32 = capabilityschematest interfaceschematest \ +am__EXEEXT_33 = capabilityschematest interfaceschematest \ networkschematest storagepoolschematest storagevolschematest \ domaincapsschematest domainschematest nodedevschematest \ nwfilterschematest domainsnapshotschematest secretschematest \ - $(am__EXEEXT_31) $(am__append_33) + $(am__EXEEXT_32) $(am__append_34) TEST_SUITE_LOG = test-suite.log TEST_EXTENSIONS = @EXEEXT@ .test LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver @@ -2333,6 +2343,7 @@ HAVE_LOGF = @HAVE_LOGF@ HAVE_LOGL = @HAVE_LOGL@ HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@ HAVE_LSTAT = @HAVE_LSTAT@ +HAVE_MAX_ALIGN_T = @HAVE_MAX_ALIGN_T@ HAVE_MBRLEN = @HAVE_MBRLEN@ HAVE_MBRTOWC = @HAVE_MBRTOWC@ HAVE_MBSINIT = @HAVE_MBSINIT@ @@ -3163,17 +3174,17 @@ EXTRA_DIST = bhyvexml2argvdata bhyvexml2xmloutdata \ storagevolxml2xmlout sysinfodata test-lib.sh vircaps2xmldata \ vboxsnapshotxmldata virsh-uriprecedence virfiledata \ virpcitestdata virscsidata virusbtestdata vmx2xmldata \ - xencapsdata xmconfigdata xml2sexprdata xml2vmxdata \ - vmwareverdata .valgrind.supp virmock.h $(am__append_32) \ - $(am__append_34) $(test_scripts) $(am__append_39) \ - $(am__append_43) $(am__append_45) $(am__append_46) \ - openvzutilstest.conf $(am__append_47) $(am__append_48) \ - $(am__append_49) $(am__append_50) $(am__append_52) \ + xencapsdata xmconfigdata xlconfigdata xml2sexprdata \ + xml2vmxdata vmwareverdata .valgrind.supp virmock.h \ + $(am__append_33) $(am__append_35) $(test_scripts) \ + $(am__append_40) $(am__append_44) $(am__append_46) \ + $(am__append_47) openvzutilstest.conf $(am__append_48) \ + $(am__append_49) $(am__append_50) $(am__append_51) \ $(am__append_53) $(am__append_54) $(am__append_55) \ - $(am__append_58) $(am__append_63) $(am__append_64) \ - $(am__append_66) securityselinuxtest.c \ + $(am__append_56) $(am__append_59) $(am__append_64) \ + $(am__append_65) $(am__append_67) securityselinuxtest.c \ securityselinuxlabeltest.c securityselinuxhelper.c \ - $(am__append_69) $(am__append_70) + $(am__append_70) $(am__append_71) test_helpers = commandhelper ssh test_conf test_programs = virshtest sockettest nodeinfotest virbuftest \ commandtest seclabeltest virhashtest viratomictest utiltest \ @@ -3190,12 +3201,13 @@ test_programs = virshtest sockettest nodeinfotest virbuftest \ $(am__append_13) $(am__append_14) $(am__append_15) \ $(am__append_16) $(am__append_17) $(am__append_18) \ $(am__append_19) $(am__append_20) $(am__append_21) \ - $(am__append_22) networkxml2xmltest networkxml2xmlupdatetest \ - $(NULL) $(am__append_23) $(am__append_24) nwfilterxml2xmltest \ - $(am__append_25) $(am__append_26) $(am__append_27) \ - $(am__append_28) storagevolxml2xmltest storagepoolxml2xmltest \ + $(am__append_22) $(am__append_23) networkxml2xmltest \ + networkxml2xmlupdatetest $(NULL) $(am__append_24) \ + $(am__append_25) nwfilterxml2xmltest $(am__append_26) \ + $(am__append_27) $(am__append_28) $(am__append_29) \ + storagevolxml2xmltest storagepoolxml2xmltest \ nodedevxml2xmltest interfacexml2xmltest cputest metadatatest \ - secretxml2xmltest $(am__append_29) $(am__append_31) \ + secretxml2xmltest $(am__append_30) $(am__append_32) \ objecteventtest # This is a fake SSH we use from virnetsockettest @@ -3205,15 +3217,15 @@ test_scripts = capabilityschematest interfaceschematest \ networkschematest storagepoolschematest storagevolschematest \ domaincapsschematest domainschematest nodedevschematest \ nwfilterschematest domainsnapshotschematest secretschematest \ - $(am__append_30) $(am__append_33) + $(am__append_31) $(am__append_34) test_libraries = libshunload.la libvirportallocatormock.la \ virnetserverclientmock.la vircgroupmock.la virpcimock.la \ - $(NULL) $(am__append_35) $(am__append_36) $(am__append_37) \ - $(am__append_38) + $(NULL) $(am__append_36) $(am__append_37) $(am__append_38) \ + $(am__append_39) @WITH_TESTS_TRUE@noinst_LTLIBRARIES = $(test_libraries) \ -@WITH_TESTS_TRUE@ $(am__append_67) +@WITH_TESTS_TRUE@ $(am__append_68) @WITH_TESTS_FALSE@check_LTLIBRARIES = $(test_libraries) \ -@WITH_TESTS_FALSE@ $(am__append_68) +@WITH_TESTS_FALSE@ $(am__append_69) # NB, automake < 1.10 does not provide the real # abs_top_{src/build}dir or builddir variables, so don't rely @@ -3258,6 +3270,11 @@ sockettest_LDADD = $(LDADDS) @WITH_XEN_TRUE@ testutils.c testutils.h @WITH_XEN_TRUE@sexpr2xmltest_LDADD = $(xen_LDADDS) +@WITH_XEN_TRUE@xlconfigtest_SOURCES = \ +@WITH_XEN_TRUE@ xlconfigtest.c testutilsxen.c testutilsxen.h \ +@WITH_XEN_TRUE@ testutils.c testutils.h + +@WITH_XEN_TRUE@xlconfigtest_LDADD = $(xen_LDADDS) @WITH_XEN_TRUE@xmconfigtest_SOURCES = \ @WITH_XEN_TRUE@ xmconfigtest.c testutilsxen.c testutilsxen.h \ @WITH_XEN_TRUE@ testutils.c testutils.h @@ -3282,8 +3299,8 @@ QEMUMONITORTESTUTILS_SOURCES = \ @WITH_QEMU_TRUE@libqemumonitortestutils_la_SOURCES = $(QEMUMONITORTESTUTILS_SOURCES) @WITH_QEMU_TRUE@qemu_LDADDS = ../src/libvirt_driver_qemu_impl.la \ -@WITH_QEMU_TRUE@ $(am__append_40) $(am__append_41) \ -@WITH_QEMU_TRUE@ $(am__append_42) +@WITH_QEMU_TRUE@ $(am__append_41) $(am__append_42) \ +@WITH_QEMU_TRUE@ $(am__append_43) @WITH_QEMU_TRUE@qemuxml2argvtest_SOURCES = \ @WITH_QEMU_TRUE@ qemuxml2argvtest.c testutilsqemu.c testutilsqemu.h \ @WITH_QEMU_TRUE@ testutils.c testutils.h @@ -3359,7 +3376,7 @@ QEMUMONITORTESTUTILS_SOURCES = \ @WITH_QEMU_TRUE@domainsnapshotxml2xmltest_LDADD = $(qemu_LDADDS) $(LDADDS) @WITH_LXC_TRUE@lxc_LDADDS = ../src/libvirt_driver_lxc_impl.la \ -@WITH_LXC_TRUE@ $(am__append_44) $(LDADDS) +@WITH_LXC_TRUE@ $(am__append_45) $(LDADDS) @WITH_LXC_TRUE@lxcxml2xmltest_SOURCES = \ @WITH_LXC_TRUE@ lxcxml2xmltest.c testutilslxc.c testutilslxc.h \ @WITH_LXC_TRUE@ testutils.c testutils.h @@ -3409,7 +3426,7 @@ QEMUMONITORTESTUTILS_SOURCES = \ @WITH_BHYVE_TRUE@ -rpath /evil/libtool/hack/to/force/shared/lib/creation @WITH_BHYVE_TRUE@bhyve_LDADDS = ../src/libvirt_driver_bhyve_impl.la \ -@WITH_BHYVE_TRUE@ $(am__append_51) $(LDADDS) +@WITH_BHYVE_TRUE@ $(am__append_52) $(LDADDS) @WITH_BHYVE_TRUE@bhyvexml2argvtest_SOURCES = \ @WITH_BHYVE_TRUE@ bhyvexml2argvtest.c \ @WITH_BHYVE_TRUE@ testutils.c testutils.h @@ -3548,8 +3565,8 @@ vircaps2xmltest_SOURCES = \ vircaps2xmltest_LDADD = $(LDADDS) domaincapstest_SOURCES = domaincapstest.c testutils.h testutils.c \ - $(am__append_56) -domaincapstest_LDADD = $(LDADDS) $(am__append_57) + $(am__append_57) +domaincapstest_LDADD = $(LDADDS) $(am__append_58) @WITH_LIBVIRTD_TRUE@libvirtdconftest_SOURCES = \ @WITH_LIBVIRTD_TRUE@ libvirtdconftest.c testutils.h testutils.c \ @WITH_LIBVIRTD_TRUE@ $(NULL) @@ -3580,15 +3597,15 @@ virnetserverclientmock_la_LDFLAGS = -module -avoid-version \ @WITH_GNUTLS_TRUE@virnettlscontexttest_SOURCES = \ @WITH_GNUTLS_TRUE@ virnettlscontexttest.c virnettlshelpers.h \ @WITH_GNUTLS_TRUE@ virnettlshelpers.c testutils.h testutils.c \ -@WITH_GNUTLS_TRUE@ $(am__append_59) +@WITH_GNUTLS_TRUE@ $(am__append_60) @WITH_GNUTLS_TRUE@virnettlscontexttest_LDADD = $(LDADDS) \ -@WITH_GNUTLS_TRUE@ $(GNUTLS_LIBS) $(am__append_60) +@WITH_GNUTLS_TRUE@ $(GNUTLS_LIBS) $(am__append_61) @WITH_GNUTLS_TRUE@virnettlssessiontest_SOURCES = \ @WITH_GNUTLS_TRUE@ virnettlssessiontest.c virnettlshelpers.h \ @WITH_GNUTLS_TRUE@ virnettlshelpers.c testutils.h testutils.c \ -@WITH_GNUTLS_TRUE@ $(am__append_61) +@WITH_GNUTLS_TRUE@ $(am__append_62) @WITH_GNUTLS_TRUE@virnettlssessiontest_LDADD = $(LDADDS) \ -@WITH_GNUTLS_TRUE@ $(GNUTLS_LIBS) $(am__append_62) +@WITH_GNUTLS_TRUE@ $(GNUTLS_LIBS) $(am__append_63) virtimetest_SOURCES = \ virtimetest.c testutils.h testutils.c @@ -3611,7 +3628,7 @@ virstoragetest_LDADD = $(LDADDS) \ viridentitytest_SOURCES = \ viridentitytest.c testutils.h testutils.c -viridentitytest_LDADD = $(LDADDS) $(am__append_65) +viridentitytest_LDADD = $(LDADDS) $(am__append_66) @WITH_SELINUX_TRUE@viridentitytest_DEPENDENCIES = libsecurityselinuxhelper.la \ @WITH_SELINUX_TRUE@ ../src/libvirt.la @@ -4373,6 +4390,10 @@ xencapstest$(EXEEXT): $(xencapstest_OBJECTS) $(xencapstest_DEPENDENCIES) $(EXTRA @rm -f xencapstest$(EXEEXT) $(AM_V_CCLD)$(LINK) $(xencapstest_OBJECTS) $(xencapstest_LDADD) $(LIBS) +xlconfigtest$(EXEEXT): $(xlconfigtest_OBJECTS) $(xlconfigtest_DEPENDENCIES) $(EXTRA_xlconfigtest_DEPENDENCIES) + @rm -f xlconfigtest$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(xlconfigtest_OBJECTS) $(xlconfigtest_LDADD) $(LIBS) + xmconfigtest$(EXEEXT): $(xmconfigtest_OBJECTS) $(xmconfigtest_DEPENDENCIES) $(EXTRA_xmconfigtest_DEPENDENCIES) @rm -f xmconfigtest$(EXEEXT) $(AM_V_CCLD)$(LINK) $(xmconfigtest_OBJECTS) $(xmconfigtest_LDADD) $(LIBS) @@ -4517,6 +4538,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vmwarevertest.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vmx2xmltest.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xencapstest.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xlconfigtest.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmconfigtest.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xml2sexprtest.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xml2vmxtest.Po@am__quote@ @@ -5367,6 +5389,13 @@ reconnect.log: reconnect$(EXEEXT) --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) +xlconfigtest.log: xlconfigtest$(EXEEXT) + @p='xlconfigtest$(EXEEXT)'; \ + b='xlconfigtest'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) qemuxml2argvtest.log: qemuxml2argvtest$(EXEEXT) @p='qemuxml2argvtest$(EXEEXT)'; \ b='qemuxml2argvtest'; \ diff --git a/tests/bhyvexml2argvtest.c b/tests/bhyvexml2argvtest.c index cd3aea0c2..c5b068141 100644 --- a/tests/bhyvexml2argvtest.c +++ b/tests/bhyvexml2argvtest.c @@ -33,7 +33,7 @@ static int testCompareXMLToArgvFiles(const char *xml, if (!(vmdef = virDomainDefParseFile(xml, driver.caps, driver.xmlopt, 1 << VIR_DOMAIN_VIRT_BHYVE, - VIR_DOMAIN_XML_INACTIVE))) + VIR_DOMAIN_DEF_PARSE_INACTIVE))) goto out; vm.def = vmdef; diff --git a/tests/bhyvexml2xmltest.c b/tests/bhyvexml2xmltest.c index 81cba0f96..a1a370174 100644 --- a/tests/bhyvexml2xmltest.c +++ b/tests/bhyvexml2xmltest.c @@ -28,10 +28,10 @@ testCompareXMLToXMLFiles(const char *inxml, const char *outxml) if (!(def = virDomainDefParseString(inXmlData, driver.caps, driver.xmlopt, 1 << VIR_DOMAIN_VIRT_BHYVE, - VIR_DOMAIN_XML_INACTIVE))) + VIR_DOMAIN_DEF_PARSE_INACTIVE))) goto fail; - if (!(actual = virDomainDefFormat(def, VIR_DOMAIN_XML_INACTIVE))) + if (!(actual = virDomainDefFormat(def, VIR_DOMAIN_DEF_FORMAT_INACTIVE))) goto fail; if (STRNEQ(outXmlData, actual)) { diff --git a/tests/capabilityschemadata/caps-qemu-kvm.xml b/tests/capabilityschemadata/caps-qemu-kvm.xml index 55faa16b2..7055c7a81 100644 --- a/tests/capabilityschemadata/caps-qemu-kvm.xml +++ b/tests/capabilityschemadata/caps-qemu-kvm.xml @@ -39,8 +39,7 @@ <machine canonical='pc-0.11' maxCpus='255'>pc</machine> <machine maxCpus='255'>pc-0.10</machine> <machine maxCpus='1'>isapc</machine> - <domain type='qemu'> - </domain> + <domain type='qemu'/> <domain type='kvm'> <emulator>/usr/bin/qemu-kvm</emulator> <machine maxCpus='255'>pc-0.11</machine> @@ -66,8 +65,7 @@ <machine canonical='pc-0.11'>pc</machine> <machine>pc-0.10</machine> <machine>isapc</machine> - <domain type='qemu'> - </domain> + <domain type='qemu'/> <domain type='kvm'> <emulator>/usr/bin/qemu-kvm</emulator> <machine>pc-0.11</machine> @@ -108,8 +106,7 @@ <machine>realview</machine> <machine>versatilepb</machine> <machine>versatileab</machine> - <domain type='qemu'> - </domain> + <domain type='qemu'/> </arch> </guest> @@ -119,8 +116,7 @@ <wordsize>64</wordsize> <emulator>/usr/bin/qemu-system-aarch64</emulator> <machine>machvirt</machine> - <domain type='qemu'> - </domain> + <domain type='qemu'/> </arch> </guest> @@ -131,8 +127,7 @@ <emulator>/usr/bin/qemu-system-microblaze</emulator> <machine>petalogix-s3adsp1800</machine> <machine>microblaze-fdt</machine> - <domain type='qemu'> - </domain> + <domain type='qemu'/> </arch> </guest> @@ -143,8 +138,7 @@ <emulator>/usr/bin/qemu-system-microblazeel</emulator> <machine>petalogix-s3adsp1800</machine> <machine>microblaze-fdt</machine> - <domain type='qemu'> - </domain> + <domain type='qemu'/> </arch> </guest> @@ -158,8 +152,7 @@ <machine>magnum</machine> <machine>pica61</machine> <machine>mips</machine> - <domain type='qemu'> - </domain> + <domain type='qemu'/> </arch> </guest> @@ -173,8 +166,7 @@ <machine>magnum</machine> <machine>pica61</machine> <machine>mips</machine> - <domain type='qemu'> - </domain> + <domain type='qemu'/> </arch> </guest> @@ -195,8 +187,7 @@ <machine>SS-1000</machine> <machine>SS-2000</machine> <machine>SS-2</machine> - <domain type='qemu'> - </domain> + <domain type='qemu'/> </arch> </guest> @@ -212,8 +203,7 @@ <machine>taihu</machine> <machine>mac99</machine> <machine>prep</machine> - <domain type='qemu'> - </domain> + <domain type='qemu'/> </arch> </guest> @@ -223,8 +213,7 @@ <wordsize>32</wordsize> <emulator>/usr/bin/xenner</emulator> <machine>xenner</machine> - <domain type='kvm'> - </domain> + <domain type='kvm'/> </arch> <features> <pae/> @@ -240,8 +229,7 @@ <wordsize>64</wordsize> <emulator>/usr/bin/xenner</emulator> <machine>xenner</machine> - <domain type='kvm'> - </domain> + <domain type='kvm'/> </arch> <features> <acpi default='on' toggle='yes'/> diff --git a/tests/capabilityschemadata/caps-test.xml b/tests/capabilityschemadata/caps-test.xml index 64f9bb648..da199611e 100644 --- a/tests/capabilityschemadata/caps-test.xml +++ b/tests/capabilityschemadata/caps-test.xml @@ -43,8 +43,7 @@ <arch name='i686'> <wordsize>32</wordsize> <emulator>/usr/bin/test-hv</emulator> - <domain type='test'> - </domain> + <domain type='test'/> </arch> <features> <pae/> @@ -57,8 +56,7 @@ <arch name='i686'> <wordsize>32</wordsize> <emulator>/usr/bin/test-hv</emulator> - <domain type='test'> - </domain> + <domain type='test'/> </arch> <features> <pae/> diff --git a/tests/capabilityschemadata/caps-test2.xml b/tests/capabilityschemadata/caps-test2.xml index a99c1b8eb..e67639591 100644 --- a/tests/capabilityschemadata/caps-test2.xml +++ b/tests/capabilityschemadata/caps-test2.xml @@ -51,8 +51,7 @@ <machine>pc-0.11</machine> <machine>pc-0.10</machine> <machine>isapc</machine> - <domain type='qemu'> - </domain> + <domain type='qemu'/> <domain type='kvm'> <emulator>/usr/libexec/qemu-kvm</emulator> <machine>pc-1.2</machine> @@ -94,8 +93,7 @@ <machine>pc-0.11</machine> <machine>pc-0.10</machine> <machine>isapc</machine> - <domain type='qemu'> - </domain> + <domain type='qemu'/> <domain type='kvm'> <emulator>/usr/libexec/qemu-kvm</emulator> <machine>pc-1.2</machine> diff --git a/tests/cputest.c b/tests/cputest.c index a5075768f..e49ae2471 100644 --- a/tests/cputest.c +++ b/tests/cputest.c @@ -153,7 +153,7 @@ static int cpuTestCompareXML(const char *arch, virCPUDef *cpu, const char *name, - unsigned int flags) + bool updateCPU) { char *xml = NULL; char *expected = NULL; @@ -167,7 +167,7 @@ cpuTestCompareXML(const char *arch, if (virtTestLoadFile(xml, &expected) < 0) goto cleanup; - if (!(actual = virCPUDefFormat(cpu, flags))) + if (!(actual = virCPUDefFormat(cpu, updateCPU))) goto cleanup; if (STRNEQ(expected, actual)) { @@ -303,7 +303,7 @@ cpuTestGuestData(const void *arg) } result = virBufferContentAndReset(&buf); - ret = cpuTestCompareXML(data->arch, guest, result, 0); + ret = cpuTestCompareXML(data->arch, guest, result, false); cleanup: VIR_FREE(result); @@ -351,7 +351,7 @@ cpuTestBaseline(const void *arg) if (virAsprintf(&result, "%s-%s", data->name, suffix) < 0) goto cleanup; - if (cpuTestCompareXML(data->arch, baseline, result, 0) < 0) + if (cpuTestCompareXML(data->arch, baseline, result, false) < 0) goto cleanup; for (i = 0; i < ncpus; i++) { @@ -403,8 +403,7 @@ cpuTestUpdate(const void *arg) if (virAsprintf(&result, "%s+%s", data->host, data->name) < 0) goto cleanup; - ret = cpuTestCompareXML(data->arch, cpu, result, - VIR_DOMAIN_XML_UPDATE_CPU); + ret = cpuTestCompareXML(data->arch, cpu, result, true); cleanup: virCPUDefFree(host); diff --git a/tests/domainschemadata/domain-parallels-ct-simple.xml b/tests/domainschemadata/domain-parallels-ct-simple.xml index a2b87ce85..b79e963a3 100644 --- a/tests/domainschemadata/domain-parallels-ct-simple.xml +++ b/tests/domainschemadata/domain-parallels-ct-simple.xml @@ -18,6 +18,11 @@ <source name='centos-6-x86_64'/> <target dir='/'/> </filesystem> + <filesystem type='file' accessmode='passthrough'> + <driver type='ploop' format='ploop'/> + <source file='/path/to/ploop/dir'/> + <target dir='/mnt'/> + </filesystem> <video> <model type='vga' vram='16777216' heads='1'> <acceleration accel3d='no' accel2d='no'/> diff --git a/tests/domainsnapshotxml2xmltest.c b/tests/domainsnapshotxml2xmltest.c index 1b3a28f77..845d52f88 100644 --- a/tests/domainsnapshotxml2xmltest.c +++ b/tests/domainsnapshotxml2xmltest.c @@ -102,7 +102,7 @@ testCompareXMLToXMLFiles(const char *inxml, goto cleanup; if (!(actual = virDomainSnapshotDefFormat(uuid, def, - VIR_DOMAIN_XML_SECURE, + VIR_DOMAIN_DEF_FORMAT_SECURE, internal))) goto cleanup; diff --git a/tests/libvirtdconftest.c b/tests/libvirtdconftest.c index 8b93f4ecb..d589d51ce 100644 --- a/tests/libvirtdconftest.c +++ b/tests/libvirtdconftest.c @@ -65,7 +65,7 @@ munge_param(const char *datain, if (c_isspace(*tmp)) continue; if (c_isdigit(*tmp)) { - *type = VIR_CONF_LONG; + *type = VIR_CONF_ULONG; replace = "\"foo\""; } else if (*tmp == '[') { *type = VIR_CONF_LIST; @@ -130,15 +130,16 @@ testCorrupt(const void *opaque) #endif switch (type) { - case VIR_CONF_LONG: - if (!strstr(err->message, "invalid type: got string; expected long")) { + case VIR_CONF_ULONG: + if (!strstr(err->message, "invalid type: got string; expected unsigned long") && + !strstr(err->message, "invalid type: got string; expected long")) { VIR_DEBUG("Wrong error for long: '%s'", err->message); ret = -1; } break; case VIR_CONF_STRING: - if (!strstr(err->message, "invalid type: got long; expected string")) { + if (!strstr(err->message, "invalid type: got unsigned long; expected string")) { VIR_DEBUG("Wrong error for string: '%s'", err->message); ret = -1; diff --git a/tests/lxcconf2xmldata/lxcconf2xml-physnetwork.config b/tests/lxcconf2xmldata/lxcconf2xml-physnetwork.config index ed196e1e8..779dac2b1 100644 --- a/tests/lxcconf2xmldata/lxcconf2xml-physnetwork.config +++ b/tests/lxcconf2xmldata/lxcconf2xml-physnetwork.config @@ -1,6 +1,10 @@ lxc.network.type = phys lxc.network.link = eth0 lxc.network.name = eth1 +lxc.network.ipv4 = 192.168.122.2/24 +lxc.network.ipv4.gateway = 192.168.122.1 +lxc.network.ipv6 = 2003:db8:1:0:214:1234:fe0b:3596/64 +lxc.network.ipv6.gateway = 2003:db8:1:0:214:1234:fe0b:3595 lxc.rootfs = /var/lib/lxc/migrate_test/rootfs lxc.utsname = migrate_test diff --git a/tests/lxcconf2xmldata/lxcconf2xml-physnetwork.xml b/tests/lxcconf2xmldata/lxcconf2xml-physnetwork.xml index cfaceb520..79bcfa003 100644 --- a/tests/lxcconf2xmldata/lxcconf2xml-physnetwork.xml +++ b/tests/lxcconf2xmldata/lxcconf2xml-physnetwork.xml @@ -25,6 +25,10 @@ <source> <interface>eth0</interface> </source> + <ip address='192.168.122.2' family='ipv4' prefix='24'/> + <ip address='2003:db8:1:0:214:1234:fe0b:3596' family='ipv6' prefix='64'/> + <route family='ipv4' address='0.0.0.0' gateway='192.168.122.1'/> + <route family='ipv6' address='::' gateway='2003:db8:1:0:214:1234:fe0b:3595'/> </hostdev> </devices> </domain> diff --git a/tests/lxcconf2xmldata/lxcconf2xml-simple.config b/tests/lxcconf2xmldata/lxcconf2xml-simple.config index b90abc11a..50a44bba9 100644 --- a/tests/lxcconf2xmldata/lxcconf2xml-simple.config +++ b/tests/lxcconf2xmldata/lxcconf2xml-simple.config @@ -6,6 +6,10 @@ lxc.network.flags = up lxc.network.link = virbr0 lxc.network.hwaddr = 02:00:15:8f:05:c1 lxc.network.name = eth0 +lxc.network.ipv4 = 192.168.122.2/24 +lxc.network.ipv4.gateway = 192.168.122.1 +lxc.network.ipv6 = 2003:db8:1:0:214:1234:fe0b:3596/64 +lxc.network.ipv6.gateway = 2003:db8:1:0:214:1234:fe0b:3595 #remove next line if host DNS configuration should not be available to container lxc.mount.entry = proc proc proc nodev,noexec,nosuid 0 0 diff --git a/tests/lxcconf2xmldata/lxcconf2xml-simple.xml b/tests/lxcconf2xmldata/lxcconf2xml-simple.xml index 10428ec61..45a2012c5 100644 --- a/tests/lxcconf2xmldata/lxcconf2xml-simple.xml +++ b/tests/lxcconf2xmldata/lxcconf2xml-simple.xml @@ -37,6 +37,10 @@ <interface type='bridge'> <mac address='02:00:15:8f:05:c1'/> <source bridge='virbr0'/> + <ip address='192.168.122.2' family='ipv4' prefix='24'/> + <ip address='2003:db8:1:0:214:1234:fe0b:3596' family='ipv6' prefix='64'/> + <route family='ipv4' address='0.0.0.0' gateway='192.168.122.1'/> + <route family='ipv6' address='::' gateway='2003:db8:1:0:214:1234:fe0b:3595'/> <guest dev='eth0'/> <link state='up'/> </interface> diff --git a/tests/lxcxml2xmldata/lxc-hostdev.xml b/tests/lxcxml2xmldata/lxc-hostdev.xml index befe0db32..39725947a 100644 --- a/tests/lxcxml2xmldata/lxc-hostdev.xml +++ b/tests/lxcxml2xmldata/lxc-hostdev.xml @@ -35,6 +35,10 @@ <source> <interface>eth0</interface> </source> + <ip address='192.168.122.2' family='ipv4'/> + <ip address='2003:db8:1:0:214:1234:fe0b:3596' family='ipv6' prefix='24'/> + <route family='ipv4' address='0.0.0.0' gateway='192.168.122.1'/> + <route family='ipv6' address='::' gateway='2003:db8:1:0:214:1234:fe0b:3595'/> </hostdev> </devices> </domain> diff --git a/tests/lxcxml2xmldata/lxc-idmap.xml b/tests/lxcxml2xmldata/lxc-idmap.xml index 946d36357..b477636c3 100644 --- a/tests/lxcxml2xmldata/lxc-idmap.xml +++ b/tests/lxcxml2xmldata/lxc-idmap.xml @@ -28,6 +28,10 @@ <interface type='bridge'> <mac address='00:16:3e:0f:ef:8a'/> <source bridge='bri0'/> + <ip address='192.168.122.12' family='ipv4' prefix='24'/> + <ip address='192.168.122.13' family='ipv4' prefix='24'/> + <route family='ipv4' address='0.0.0.0' gateway='192.168.122.1'/> + <route family='ipv4' address='192.168.124.0' prefix='24' gateway='192.168.124.1'/> <target dev='veth0'/> <guest dev='eth2'/> </interface> diff --git a/tests/lxcxml2xmltest.c b/tests/lxcxml2xmltest.c index 6dce070db..e372dcd16 100644 --- a/tests/lxcxml2xmltest.c +++ b/tests/lxcxml2xmltest.c @@ -38,7 +38,7 @@ testCompareXMLToXMLFiles(const char *inxml, const char *outxml, bool live) if (!(def = virDomainDefParseString(inXmlData, caps, xmlopt, 1 << VIR_DOMAIN_VIRT_LXC, - live ? 0 : VIR_DOMAIN_XML_INACTIVE))) + live ? 0 : VIR_DOMAIN_DEF_PARSE_INACTIVE))) goto fail; if (!virDomainDefCheckABIStability(def, def)) { @@ -46,7 +46,7 @@ testCompareXMLToXMLFiles(const char *inxml, const char *outxml, bool live) goto fail; } - if (!(actual = virDomainDefFormat(def, VIR_DOMAIN_XML_SECURE))) + if (!(actual = virDomainDefFormat(def, VIR_DOMAIN_DEF_FORMAT_SECURE))) goto fail; if (STRNEQ(outXmlData, actual)) { diff --git a/tests/networkxml2confdata/nat-network-dns-local-domain.conf b/tests/networkxml2confdata/nat-network-dns-local-domain.conf new file mode 100644 index 000000000..5f41b9186 --- /dev/null +++ b/tests/networkxml2confdata/nat-network-dns-local-domain.conf @@ -0,0 +1,14 @@ +##WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE +##OVERWRITTEN AND LOST. Changes to this configuration should be made using: +## virsh net-edit default +## or other application using the libvirt API. +## +## dnsmasq conf file created by libvirt +strict-order +local=/example.com/ +domain=example.com +expand-hosts +except-interface=lo +bind-dynamic +interface=virbr0 +addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts diff --git a/tests/networkxml2confdata/nat-network-dns-local-domain.xml b/tests/networkxml2confdata/nat-network-dns-local-domain.xml new file mode 100644 index 000000000..a92d71f1f --- /dev/null +++ b/tests/networkxml2confdata/nat-network-dns-local-domain.xml @@ -0,0 +1,9 @@ +<network> + <name>default</name> + <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9c</uuid> + <forward dev='eth0' mode='nat'/> + <bridge name='virbr0' stp='on' delay='0' /> + <domain name='example.com' localOnly='yes'/> + <ip address='192.168.122.1' netmask='255.255.255.0'> + </ip> +</network> diff --git a/tests/networkxml2conftest.c b/tests/networkxml2conftest.c index 267513f63..280db306b 100644 --- a/tests/networkxml2conftest.c +++ b/tests/networkxml2conftest.c @@ -134,6 +134,7 @@ mymain(void) DO_TEST("nat-network-dns-hosts", full); DO_TEST("nat-network-dns-forward-plain", full); DO_TEST("nat-network-dns-forwarders", full); + DO_TEST("nat-network-dns-local-domain", full); DO_TEST("dhcp6-network", dhcpv6); DO_TEST("dhcp6-nat-network", dhcpv6); DO_TEST("dhcp6host-routed-network", dhcpv6); diff --git a/tests/networkxml2firewalltest.c b/tests/networkxml2firewalltest.c index 1225c443d..c69ab54ba 100644 --- a/tests/networkxml2firewalltest.c +++ b/tests/networkxml2firewalltest.c @@ -135,6 +135,8 @@ mymain(void) ret = -1; \ } while (0) + virFirewallSetLockOverride(true); + if (virFirewallSetBackend(VIR_FIREWALL_BACKEND_DIRECT) < 0) { ret = -1; goto cleanup; diff --git a/tests/nwfilterebiptablestest.c b/tests/nwfilterebiptablestest.c index e04bc21e5..e1330efc6 100644 --- a/tests/nwfilterebiptablestest.c +++ b/tests/nwfilterebiptablestest.c @@ -24,6 +24,7 @@ #include "testutils.h" #include "nwfilter/nwfilter_ebiptables_driver.h" #include "virbuffer.h" +#include "virfirewall.h" #define __VIR_FIREWALL_PRIV_H_ALLOW__ #include "virfirewallpriv.h" @@ -522,6 +523,8 @@ mymain(void) { int ret = 0; + virFirewallSetLockOverride(true); + if (virFirewallSetBackend(VIR_FIREWALL_BACKEND_DIRECT) < 0) { ret = -1; goto cleanup; diff --git a/tests/nwfilterxml2firewalldata/ipv6-linux.args b/tests/nwfilterxml2firewalldata/ipv6-linux.args index a42566ca7..735f66371 100644 --- a/tests/nwfilterxml2firewalldata/ipv6-linux.args +++ b/tests/nwfilterxml2firewalldata/ipv6-linux.args @@ -18,3 +18,19 @@ ebtables -t nat -A libvirt-J-vnet0 -p ipv6 --ip6-destination 1::2/128 \ --ip6-source a:b:c::/65 --ip6-protocol 18 -j ACCEPT ebtables -t nat -A libvirt-P-vnet0 -p ipv6 --ip6-source 1::2/128 \ --ip6-destination a:b:c::/65 --ip6-protocol 18 -j ACCEPT +ebtables -t nat -A libvirt-J-vnet0 -p ipv6 --ip6-destination 1::2/128 \ +--ip6-source a:b:c::/65 --ip6-protocol 58 --ip6-icmp-type 1:11/10:11 -j ACCEPT +ebtables -t nat -A libvirt-P-vnet0 -p ipv6 --ip6-source 1::2/128 \ +--ip6-destination a:b:c::/65 --ip6-protocol 58 --ip6-icmp-type 1:11/10:11 -j ACCEPT +ebtables -t nat -A libvirt-J-vnet0 -p ipv6 --ip6-destination 1::2/128 \ +--ip6-source a:b:c::/65 --ip6-protocol 58 --ip6-icmp-type 1:1/10:10 -j ACCEPT +ebtables -t nat -A libvirt-P-vnet0 -p ipv6 --ip6-source 1::2/128 \ +--ip6-destination a:b:c::/65 --ip6-protocol 58 --ip6-icmp-type 1:1/10:10 -j ACCEPT +ebtables -t nat -A libvirt-J-vnet0 -p ipv6 --ip6-destination 1::2/128 \ +--ip6-source a:b:c::/65 --ip6-protocol 58 --ip6-icmp-type 0:255/10:10 -j ACCEPT +ebtables -t nat -A libvirt-P-vnet0 -p ipv6 --ip6-source 1::2/128 \ +--ip6-destination a:b:c::/65 --ip6-protocol 58 --ip6-icmp-type 0:255/10:10 -j ACCEPT +ebtables -t nat -A libvirt-J-vnet0 -p ipv6 --ip6-destination 1::2/128 \ +--ip6-source a:b:c::/65 --ip6-protocol 58 --ip6-icmp-type 1:1/0:255 -j ACCEPT +ebtables -t nat -A libvirt-P-vnet0 -p ipv6 --ip6-source 1::2/128 \ +--ip6-destination a:b:c::/65 --ip6-protocol 58 --ip6-icmp-type 1:1/0:255 -j ACCEPT diff --git a/tests/nwfilterxml2firewalldata/ipv6.xml b/tests/nwfilterxml2firewalldata/ipv6.xml index 9f67bea73..240095803 100644 --- a/tests/nwfilterxml2firewalldata/ipv6.xml +++ b/tests/nwfilterxml2firewalldata/ipv6.xml @@ -40,4 +40,42 @@ /> </rule> + <rule action='accept' direction='inout'> + <ipv6 srcipaddr='1::2' srcipmask='128' + dstipaddr='a:b:c::' + dstipmask='ffff:ffff:ffff:ffff:8000::' + protocol='icmpv6' + type='1' typeend='11' + code='10' codeend='11' + /> + </rule> + + <rule action='accept' direction='inout'> + <ipv6 srcipaddr='1::2' srcipmask='128' + dstipaddr='a:b:c::' + dstipmask='ffff:ffff:ffff:ffff:8000::' + protocol='icmpv6' + type='1' + code='10' + /> + </rule> + + <rule action='accept' direction='inout'> + <ipv6 srcipaddr='1::2' srcipmask='128' + dstipaddr='a:b:c::' + dstipmask='ffff:ffff:ffff:ffff:8000::' + protocol='icmpv6' + code='10' + /> + </rule> + + <rule action='accept' direction='inout'> + <ipv6 srcipaddr='1::2' srcipmask='128' + dstipaddr='a:b:c::' + dstipmask='ffff:ffff:ffff:ffff:8000::' + protocol='icmpv6' + type='1' + /> + </rule> + </filter> diff --git a/tests/nwfilterxml2firewalltest.c b/tests/nwfilterxml2firewalltest.c index 01527f471..167ad4232 100644 --- a/tests/nwfilterxml2firewalltest.c +++ b/tests/nwfilterxml2firewalltest.c @@ -474,6 +474,8 @@ mymain(void) ret = -1; \ } while (0) + virFirewallSetLockOverride(true); + if (virFirewallSetBackend(VIR_FIREWALL_BACKEND_DIRECT) < 0) { ret = -1; goto cleanup; diff --git a/tests/nwfilterxml2xmlin/ipv6-test.xml b/tests/nwfilterxml2xmlin/ipv6-test.xml index 556796fa0..2daa3b96d 100644 --- a/tests/nwfilterxml2xmlin/ipv6-test.xml +++ b/tests/nwfilterxml2xmlin/ipv6-test.xml @@ -40,4 +40,42 @@ /> </rule> + <rule action='accept' direction='inout'> + <ipv6 srcipaddr='1::2' srcipmask='128' + dstipaddr='a:b:c::' + dstipmask='ffff:ffff:ffff:ffff:8000::' + protocol='icmpv6' + type='1' typeend='11' + code='10' codeend='11' + /> + </rule> + + <rule action='accept' direction='inout'> + <ipv6 srcipaddr='1::2' srcipmask='128' + dstipaddr='a:b:c::' + dstipmask='ffff:ffff:ffff:ffff:8000::' + protocol='icmpv6' + type='1' + code='10' + /> + </rule> + + <rule action='accept' direction='inout'> + <ipv6 srcipaddr='1::2' srcipmask='128' + dstipaddr='a:b:c::' + dstipmask='ffff:ffff:ffff:ffff:8000::' + protocol='icmpv6' + code='10' + /> + </rule> + + <rule action='accept' direction='inout'> + <ipv6 srcipaddr='1::2' srcipmask='128' + dstipaddr='a:b:c::' + dstipmask='ffff:ffff:ffff:ffff:8000::' + protocol='icmpv6' + type='1' + /> + </rule> + </filter> diff --git a/tests/nwfilterxml2xmlout/ipv6-test.xml b/tests/nwfilterxml2xmlout/ipv6-test.xml index fcc5c0da2..ce9dd0623 100644 --- a/tests/nwfilterxml2xmlout/ipv6-test.xml +++ b/tests/nwfilterxml2xmlout/ipv6-test.xml @@ -12,4 +12,16 @@ <rule action='accept' direction='inout' priority='500'> <ipv6 srcipaddr='1::2' srcipmask='128' dstipaddr='a:b:c::' dstipmask='65' protocol='18'/> </rule> + <rule action='accept' direction='inout'> + <ipv6 srcipaddr='1::2' srcipmask='128' dstipaddr='a:b:c::' dstipmask='65' protocol='icmpv6' type='1' typeend='11' code='10' codeend='11'/> + </rule> + <rule action='accept' direction='inout'> + <ipv6 srcipaddr='1::2' srcipmask='128' dstipaddr='a:b:c::' dstipmask='65' protocol='icmpv6' type='1' code='10'/> + </rule> + <rule action='accept' direction='inout'> + <ipv6 srcipaddr='1::2' srcipmask='128' dstipaddr='a:b:c::' dstipmask='65' protocol='icmpv6' code='10'/> + </rule> + <rule action='accept' direction='inout'> + <ipv6 srcipaddr='1::2' srcipmask='128' dstipaddr='a:b:c::' dstipmask='65' protocol='icmpv6' type='1'/> + </rule> </filter> diff --git a/tests/openvzutilstest.c b/tests/openvzutilstest.c index f5a8d12f7..5f8735956 100644 --- a/tests/openvzutilstest.c +++ b/tests/openvzutilstest.c @@ -93,7 +93,7 @@ testReadNetworkConf(const void *data ATTRIBUTE_UNUSED) " <devices>\n" " <interface type='ethernet'>\n" " <mac address='00:00:00:00:00:00'/>\n" - " <ip address='194.44.18.88'/>\n" + " <ip address='194.44.18.88' family='ipv4'/>\n" " </interface>\n" " <interface type='bridge'>\n" " <mac address='00:18:51:c1:05:ee'/>\n" @@ -115,7 +115,7 @@ testReadNetworkConf(const void *data ATTRIBUTE_UNUSED) goto cleanup; } - actual = virDomainDefFormat(def, VIR_DOMAIN_XML_INACTIVE); + actual = virDomainDefFormat(def, VIR_DOMAIN_DEF_FORMAT_INACTIVE); if (actual == NULL) { err = virGetLastError(); diff --git a/tests/qemuagenttest.c b/tests/qemuagenttest.c index eaf764fbc..54a45df68 100644 --- a/tests/qemuagenttest.c +++ b/tests/qemuagenttest.c @@ -187,7 +187,7 @@ testQemuAgentGetFSInfo(const void *data) if (!(def = virDomainDefParseString(domain_xml, caps, xmlopt, QEMU_EXPECTED_VIRT_TYPES, - VIR_DOMAIN_XML_INACTIVE))) + VIR_DOMAIN_DEF_PARSE_INACTIVE))) goto cleanup; if (qemuMonitorTestAddAgentSyncResponse(test) < 0) diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index 9d3996861..1c18dbbc4 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -40,6 +40,8 @@ enum { UPDATE }; +#define QEMU_HOTPLUG_TEST_DOMAIN_ID 7 + struct qemuHotplugTestData { const char *domain_filename; const char *device_filename; @@ -67,7 +69,7 @@ qemuHotplugCreateObjects(virDomainXMLOptionPtr xmlopt, driver.caps, driver.xmlopt, QEMU_EXPECTED_VIRT_TYPES, - VIR_DOMAIN_XML_INACTIVE))) + VIR_DOMAIN_DEF_PARSE_INACTIVE))) goto cleanup; priv = (*vm)->privateData; @@ -90,6 +92,8 @@ qemuHotplugCreateObjects(virDomainXMLOptionPtr xmlopt, if (qemuAssignDeviceAliases((*vm)->def, priv->qemuCaps) < 0) goto cleanup; + (*vm)->def->id = QEMU_HOTPLUG_TEST_DOMAIN_ID; + ret = 0; cleanup: return ret; @@ -177,9 +181,11 @@ testQemuHotplugCheckResult(virDomainObjPtr vm, char *actual; int ret; - actual = virDomainDefFormat(vm->def, VIR_DOMAIN_XML_SECURE); + vm->def->id = -1; + actual = virDomainDefFormat(vm->def, VIR_DOMAIN_DEF_FORMAT_SECURE); if (!actual) return -1; + vm->def->id = QEMU_HOTPLUG_TEST_DOMAIN_ID; if (STREQ(expected, actual)) { if (fail && virTestGetVerbose()) @@ -246,7 +252,7 @@ testQemuHotplug(const void *data) } if (test->action == ATTACH) - device_parse_flags = VIR_DOMAIN_XML_INACTIVE; + device_parse_flags = VIR_DOMAIN_DEF_PARSE_INACTIVE; if (!(dev = virDomainDeviceDefParse(device_xml, vm->def, caps, driver.xmlopt, diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-features.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-features.xml new file mode 100644 index 000000000..c56d62ab9 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-features.xml @@ -0,0 +1,33 @@ +<domain type='kvm'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <title>A description of the test machine.</title> + <description> + A test of qemu's minimal configuration. + This test also tests the description and title elements. + </description> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <cpu mode='host-model'> + <model fallback='allow'/> + <feature policy='require' name='abm'/> + <feature policy='force' name='ds'/> + <feature policy='disable' name='invtsc'/> + </cpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough-features-invalid.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough-features.args index 18c1dce08..88a25bf43 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough-features-invalid.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough-features.args @@ -8,7 +8,7 @@ IO_DRV=none \ /usr/bin/qemu \ -S \ -M pc \ --cpu host \ +-cpu host,+abm,+ds,-invtsc \ -m 214 \ -smp 1 \ -nographic \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough-features-invalid.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough-features.xml index b5f532643..e807dbdef 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough-features-invalid.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough-features.xml @@ -15,26 +15,8 @@ </os> <cpu mode='host-passthrough'> <feature policy='require' name='abm'/> - <feature policy='require' name='pdpe1gb'/> - <feature policy='require' name='rdrand'/> - <feature policy='require' name='f16c'/> - <feature policy='require' name='osxsave'/> - <feature policy='require' name='pdcm'/> - <feature policy='require' name='xtpr'/> - <feature policy='require' name='tm2'/> - <feature policy='require' name='est'/> - <feature policy='require' name='smx'/> - <feature policy='require' name='vmx'/> - <feature policy='require' name='ds_cpl'/> - <feature policy='require' name='monitor'/> - <feature policy='require' name='dtes64'/> - <feature policy='require' name='pbe'/> - <feature policy='require' name='tm'/> - <feature policy='require' name='ht'/> - <feature policy='require' name='ss'/> - <feature policy='require' name='acpi'/> - <feature policy='require' name='ds'/> - <feature policy='require' name='vme'/> + <feature policy='force' name='ds'/> + <feature policy='disable' name='invtsc'/> </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages3.args b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages3.args index 27b3f8ef4..f81947e97 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages3.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages3.args @@ -1,7 +1,6 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ /usr/bin/qemu -S -M pc -m 1024 -smp 2 \ --object memory-backend-ram,size=256M,id=ram-node0 \ --numa node,nodeid=0,cpus=0,memdev=ram-node0 \ +-numa node,nodeid=0,cpus=0,mem=256 \ -object memory-backend-file,prealloc=yes,\ mem-path=/dev/hugepages1G/libvirt/qemu,size=768M,id=ram-node1 \ -numa node,nodeid=1,cpus=1,memdev=ram-node1 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages6.args b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages6.args new file mode 100644 index 000000000..4eccb86e9 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages6.args @@ -0,0 +1,4 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +/usr/bin/qemu -S -M pc -m 1024 -mem-prealloc -smp 2 -nographic \ +-monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ +-hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages6.xml b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages6.xml new file mode 100644 index 000000000..4f318fdf6 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages6.xml @@ -0,0 +1,32 @@ +<domain type='qemu'> + <name>SomeDummyHugepagesGuest</name> + <uuid>ef1bdff4-27f3-4e85-a807-5fb4d58463cc</uuid> + <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> + <memoryBacking> + <hugepages> + <page size='4' unit='KiB'/> + </hugepages> + </memoryBacking> + <vcpu placement='static'>2</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode-no-memory.args b/tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode-no-memory.args index b0e274ca0..2addf971a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode-no-memory.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode-no-memory.args @@ -2,7 +2,6 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ /usr/bin/kvm -S -M pc -m 64 -smp 2 \ -object memory-backend-ram,size=32M,id=ram-node0,host-nodes=3,policy=preferred \ -numa node,nodeid=0,cpus=0,memdev=ram-node0 \ --object memory-backend-ram,size=32M,id=ram-node1 \ --numa node,nodeid=1,cpus=1,memdev=ram-node1 \ +-numa node,nodeid=1,cpus=1,mem=32 \ -nographic -monitor unix:/tmp/test-monitor,server,nowait \ -no-acpi -boot c -usb -net none -serial none -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-many.args b/tests/qemuxml2argvdata/qemuxml2argv-pci-many.args new file mode 100644 index 000000000..9551c91de --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-pci-many.args @@ -0,0 +1,63 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +/usr/libexec/qemu-kvm \ +-S -M pc-1.2 -m 2048 -smp 2 -nographic -nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait -boot c \ +-usb -drive file=/var/iso/f18kde.iso,if=none,media=cdrom,id=drive-ide0-1-0 \ +-device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ +-drive file=/var/lib/libvirt/images/test.img,if=none,id=drive-virtio-disk0 \ +-device virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,id=virtio-disk0 \ +-drive file=/var/lib/libvirt/images/test1.img,if=none,id=drive-virtio-disk0 \ +-device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,id=virtio-disk0 \ +-drive file=/var/lib/libvirt/images/disk-a-a.img,if=none,id=drive-virtio-disk0 \ +-device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk0,id=virtio-disk0 \ +-drive file=/var/lib/libvirt/images/disk-a-b.img,if=none,id=drive-virtio-disk27 \ +-device virtio-blk-pci,bus=pci.0,addr=0x7,drive=drive-virtio-disk27,id=virtio-disk27 \ +-drive file=/var/lib/libvirt/images/disk-a-c.img,if=none,id=drive-virtio-disk28 \ +-device virtio-blk-pci,bus=pci.0,addr=0x8,drive=drive-virtio-disk28,id=virtio-disk28 \ +-drive file=/var/lib/libvirt/images/disk-a-d.img,if=none,id=drive-virtio-disk29 \ +-device virtio-blk-pci,bus=pci.0,addr=0x9,drive=drive-virtio-disk29,id=virtio-disk29 \ +-drive file=/var/lib/libvirt/images/disk-b-a.img,if=none,id=drive-virtio-disk52 \ +-device virtio-blk-pci,bus=pci.0,addr=0xa,drive=drive-virtio-disk52,id=virtio-disk52 \ +-drive file=/var/lib/libvirt/images/disk-b-b.img,if=none,id=drive-virtio-disk53 \ +-device virtio-blk-pci,bus=pci.0,addr=0xb,drive=drive-virtio-disk53,id=virtio-disk53 \ +-drive file=/var/lib/libvirt/images/disk-b-c.img,if=none,id=drive-virtio-disk54 \ +-device virtio-blk-pci,bus=pci.0,addr=0xc,drive=drive-virtio-disk54,id=virtio-disk54 \ +-drive file=/var/lib/libvirt/images/disk-b-d.img,if=none,id=drive-virtio-disk55 \ +-device virtio-blk-pci,bus=pci.0,addr=0xd,drive=drive-virtio-disk55,id=virtio-disk55 \ +-drive file=/var/lib/libvirt/images/disk-c-a.img,if=none,id=drive-virtio-disk78 \ +-device virtio-blk-pci,bus=pci.0,addr=0xe,drive=drive-virtio-disk78,id=virtio-disk78 \ +-drive file=/var/lib/libvirt/images/disk-c-b.img,if=none,id=drive-virtio-disk79 \ +-device virtio-blk-pci,bus=pci.0,addr=0xf,drive=drive-virtio-disk79,id=virtio-disk79 \ +-drive file=/var/lib/libvirt/images/disk-c-c.img,if=none,id=drive-virtio-disk80 \ +-device virtio-blk-pci,bus=pci.0,addr=0x10,drive=drive-virtio-disk80,id=virtio-disk80 \ +-drive file=/var/lib/libvirt/images/disk-c-d.img,if=none,id=drive-virtio-disk81 \ +-device virtio-blk-pci,bus=pci.0,addr=0x11,drive=drive-virtio-disk81,id=virtio-disk81 \ +-drive file=/var/lib/libvirt/images/disk-d-a.img,if=none,id=drive-virtio-disk104 \ +-device virtio-blk-pci,bus=pci.0,addr=0x12,drive=drive-virtio-disk104,id=virtio-disk104 \ +-drive file=/var/lib/libvirt/images/disk-d-b.img,if=none,id=drive-virtio-disk105 \ +-device virtio-blk-pci,bus=pci.0,addr=0x13,drive=drive-virtio-disk105,id=virtio-disk105 \ +-drive file=/var/lib/libvirt/images/disk-d-c.img,if=none,id=drive-virtio-disk106 \ +-device virtio-blk-pci,bus=pci.0,addr=0x14,drive=drive-virtio-disk106,id=virtio-disk106 \ +-drive file=/var/lib/libvirt/images/disk-d-d.img,if=none,id=drive-virtio-disk107 \ +-device virtio-blk-pci,bus=pci.0,addr=0x15,drive=drive-virtio-disk107,id=virtio-disk107 \ +-drive file=/var/lib/libvirt/images/disk-e-a.img,if=none,id=drive-virtio-disk130 \ +-device virtio-blk-pci,bus=pci.0,addr=0x16,drive=drive-virtio-disk130,id=virtio-disk130 \ +-drive file=/var/lib/libvirt/images/disk-e-b.img,if=none,id=drive-virtio-disk131 \ +-device virtio-blk-pci,bus=pci.0,addr=0x17,drive=drive-virtio-disk131,id=virtio-disk131 \ +-drive file=/var/lib/libvirt/images/disk-e-c.img,if=none,id=drive-virtio-disk132 \ +-device virtio-blk-pci,bus=pci.0,addr=0x18,drive=drive-virtio-disk132,id=virtio-disk132 \ +-drive file=/var/lib/libvirt/images/disk-e-d.img,if=none,id=drive-virtio-disk133 \ +-device virtio-blk-pci,bus=pci.0,addr=0x19,drive=drive-virtio-disk133,id=virtio-disk133 \ +-drive file=/var/lib/libvirt/images/disk-f-a.img,if=none,id=drive-virtio-disk156 \ +-device virtio-blk-pci,bus=pci.0,addr=0x1a,drive=drive-virtio-disk156,id=virtio-disk156 \ +-drive file=/var/lib/libvirt/images/disk-f-b.img,if=none,id=drive-virtio-disk157 \ +-device virtio-blk-pci,bus=pci.0,addr=0x1b,drive=drive-virtio-disk157,id=virtio-disk157 \ +-drive file=/var/lib/libvirt/images/disk-f-c.img,if=none,id=drive-virtio-disk158 \ +-device virtio-blk-pci,bus=pci.0,addr=0x1c,drive=drive-virtio-disk158,id=virtio-disk158 \ +-drive file=/var/lib/libvirt/images/disk-f-d.img,if=none,id=drive-virtio-disk159 \ +-device virtio-blk-pci,bus=pci.0,addr=0x1d,drive=drive-virtio-disk159,id=virtio-disk159 \ +-drive file=/var/lib/libvirt/images/disk-g-a.img,if=none,id=drive-virtio-disk182 \ +-device virtio-blk-pci,bus=pci.0,addr=0x1e,drive=drive-virtio-disk182,id=virtio-disk182 \ +-drive file=/var/lib/libvirt/images/disk-g-b.img,if=none,id=drive-virtio-disk183 \ +-device virtio-blk-pci,bus=pci.0,addr=0x1f,drive=drive-virtio-disk183,id=virtio-disk183 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-many.xml b/tests/qemuxml2argvdata/qemuxml2argv-pci-many.xml new file mode 100644 index 000000000..400470e57 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-pci-many.xml @@ -0,0 +1,214 @@ +<domain type='qemu'> + <name>fdr-br</name> + <uuid>3ec6cbe1-b5a2-4515-b800-31a61855df41</uuid> + <memory unit='KiB'>2097152</memory> + <currentMemory unit='KiB'>2097152</currentMemory> + <vcpu placement='static' cpuset='0-1'>2</vcpu> + <os> + <type arch='x86_64' machine='pc-1.2'>hvm</type> + <boot dev='hd'/> + </os> + <features> + <acpi/> + <apic/> + <pae/> + </features> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + <devices> + <emulator>/usr/libexec/qemu-kvm</emulator> + <disk type='file' device='cdrom'> + <driver name='qemu' type='raw'/> + <source file='/var/iso/f18kde.iso'/> + <target dev='hdc' bus='ide'/> + <readonly/> + <address type='drive' controller='0' bus='1' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> + <source file='/var/lib/libvirt/images/test.img'/> + <target dev='vda' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </disk> + <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> + <source file='/var/lib/libvirt/images/test1.img'/> + <target dev='vda' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </disk> + <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> + <source file='/var/lib/libvirt/images/disk-a-a.img'/> + <target dev='vda' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> + </disk> + <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> + <source file='/var/lib/libvirt/images/disk-a-b.img'/> + <target dev='vdab' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> + </disk> + <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> + <source file='/var/lib/libvirt/images/disk-a-c.img'/> + <target dev='vdac' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/> + </disk> + <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> + <source file='/var/lib/libvirt/images/disk-a-d.img'/> + <target dev='vdad' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x09' function='0x0'/> + </disk> + <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> + <source file='/var/lib/libvirt/images/disk-b-a.img'/> + <target dev='vdba' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x0a' function='0x0'/> + </disk> + <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> + <source file='/var/lib/libvirt/images/disk-b-b.img'/> + <target dev='vdbb' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x0b' function='0x0'/> + </disk> + <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> + <source file='/var/lib/libvirt/images/disk-b-c.img'/> + <target dev='vdbc' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x0c' function='0x0'/> + </disk> + <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> + <source file='/var/lib/libvirt/images/disk-b-d.img'/> + <target dev='vdbd' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x0d' function='0x0'/> + </disk> + <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> + <source file='/var/lib/libvirt/images/disk-c-a.img'/> + <target dev='vdca' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x0e' function='0x0'/> + </disk> + <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> + <source file='/var/lib/libvirt/images/disk-c-b.img'/> + <target dev='vdcb' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x0f' function='0x0'/> + </disk> + <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> + <source file='/var/lib/libvirt/images/disk-c-c.img'/> + <target dev='vdcc' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x10' function='0x0'/> + </disk> + <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> + <source file='/var/lib/libvirt/images/disk-c-d.img'/> + <target dev='vdcd' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x11' function='0x0'/> + </disk> + <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> + <source file='/var/lib/libvirt/images/disk-d-a.img'/> + <target dev='vdda' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x12' function='0x0'/> + </disk> + <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> + <source file='/var/lib/libvirt/images/disk-d-b.img'/> + <target dev='vddb' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x13' function='0x0'/> + </disk> + <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> + <source file='/var/lib/libvirt/images/disk-d-c.img'/> + <target dev='vddc' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x14' function='0x0'/> + </disk> + <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> + <source file='/var/lib/libvirt/images/disk-d-d.img'/> + <target dev='vddd' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x15' function='0x0'/> + </disk> + <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> + <source file='/var/lib/libvirt/images/disk-e-a.img'/> + <target dev='vdea' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x16' function='0x0'/> + </disk> + <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> + <source file='/var/lib/libvirt/images/disk-e-b.img'/> + <target dev='vdeb' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x17' function='0x0'/> + </disk> + <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> + <source file='/var/lib/libvirt/images/disk-e-c.img'/> + <target dev='vdec' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x18' function='0x0'/> + </disk> + <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> + <source file='/var/lib/libvirt/images/disk-e-d.img'/> + <target dev='vded' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x19' function='0x0'/> + </disk> + <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> + <source file='/var/lib/libvirt/images/disk-f-a.img'/> + <target dev='vdfa' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x1a' function='0x0'/> + </disk> + <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> + <source file='/var/lib/libvirt/images/disk-f-b.img'/> + <target dev='vdfb' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x1b' function='0x0'/> + </disk> + <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> + <source file='/var/lib/libvirt/images/disk-f-c.img'/> + <target dev='vdfc' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x1c' function='0x0'/> + </disk> + <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> + <source file='/var/lib/libvirt/images/disk-f-d.img'/> + <target dev='vdfd' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x1d' function='0x0'/> + </disk> + <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> + <source file='/var/lib/libvirt/images/disk-g-a.img'/> + <target dev='vdga' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x1e' function='0x0'/> + </disk> + <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> + <source file='/var/lib/libvirt/images/disk-g-b.img'/> + <target dev='vdgb' bus='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x0'/> + </disk> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <video> + <model type='cirrus' vram='16384' heads='1'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </video> + <memballoon model='virtio'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> + </memballoon> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pmu-feature-off.args b/tests/qemuxml2argvdata/qemuxml2argv-pmu-feature-off.args new file mode 100644 index 000000000..4f6fe4fcb --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-pmu-feature-off.args @@ -0,0 +1,5 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +/usr/bin/qemu -S -M pc \ +-cpu qemu32,pmu=off -m 214 -smp 6 -nographic -monitor \ +unix:/tmp/test-monitor,server,nowait -boot n -usb -net none -serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pmu-feature-off.xml b/tests/qemuxml2argvdata/qemuxml2argv-pmu-feature-off.xml new file mode 100644 index 000000000..2f16023d6 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-pmu-feature-off.xml @@ -0,0 +1,25 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>6</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='network'/> + </os> + <features> + <acpi/> + <pmu state='off'/> + </features> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <controller type='usb' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pmu-feature.args b/tests/qemuxml2argvdata/qemuxml2argv-pmu-feature.args new file mode 100644 index 000000000..f28b65409 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-pmu-feature.args @@ -0,0 +1,5 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +/usr/bin/qemu -S -M pc \ +-cpu qemu32,pmu=on -m 214 -smp 6 -nographic -monitor \ +unix:/tmp/test-monitor,server,nowait -boot n -usb -net none -serial none \ +-parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pmu-feature.xml b/tests/qemuxml2argvdata/qemuxml2argv-pmu-feature.xml new file mode 100644 index 000000000..8a84703e6 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-pmu-feature.xml @@ -0,0 +1,25 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>6</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='network'/> + </os> + <features> + <acpi/> + <pmu/> + </features> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <controller type='usb' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-vgamem.args b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-vgamem.args index 5398ffe01..92e343fa0 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-vgamem.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-vgamem.args @@ -2,5 +2,5 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ /usr/bin/qemu -S -M pc -m 1024 -smp 1 -nographic -nodefaults \ -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ -hda /var/lib/libvirt/images/QEMUGuest1 \ --device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,vgamem_mb=8\ +-device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,vgamem_mb=16\ ,bus=pci.0,addr=0x2 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device-vgamem.args b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device-vgamem.args index 82aa0a9d2..51fc5246f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device-vgamem.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device-vgamem.args @@ -2,7 +2,7 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ /usr/bin/qemu -S -M pc -m 1024 -smp 1 -nographic -nodefaults \ -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ -hda /var/lib/libvirt/images/QEMUGuest1 \ --device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,vgamem_mb=8\ +-device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,vgamem_mb=16\ ,bus=pci.0,addr=0x2 -device qxl,id=video1,ram_size=67108864,vram_size=67108864\ -,vgamem_mb=8,bus=pci.0,addr=0x4 \ +,vgamem_mb=16,bus=pci.0,addr=0x4 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 9e3906884..d1a95c569 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -287,7 +287,7 @@ static int testCompareXMLToArgvFiles(const char *xml, if (!(vmdef = virDomainDefParseFile(xml, driver.caps, driver.xmlopt, QEMU_EXPECTED_VIRT_TYPES, - VIR_DOMAIN_XML_INACTIVE))) { + VIR_DOMAIN_DEF_PARSE_INACTIVE))) { if (!virtTestOOMActive() && (flags & FLAG_EXPECT_PARSE_ERROR)) goto ok; @@ -698,6 +698,9 @@ mymain(void) DO_TEST("kvm-features", NONE); DO_TEST("kvm-features-off", NONE); + DO_TEST("pmu-feature", NONE); + DO_TEST("pmu-feature-off", NONE); + DO_TEST("hugepages", QEMU_CAPS_MEM_PATH); DO_TEST_LINUX("hugepages-pages", QEMU_CAPS_MEM_PATH, QEMU_CAPS_OBJECT_MEMORY_RAM, @@ -713,6 +716,7 @@ mymain(void) DO_TEST_FAILURE("hugepages-pages4", QEMU_CAPS_MEM_PATH, QEMU_CAPS_OBJECT_MEMORY_RAM, QEMU_CAPS_OBJECT_MEMORY_FILE); DO_TEST("hugepages-pages5", QEMU_CAPS_MEM_PATH); + DO_TEST("hugepages-pages6", NONE); DO_TEST("nosharepages", QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_MEM_MERGE); DO_TEST("disk-cdrom", NONE); DO_TEST("disk-cdrom-network-http", QEMU_CAPS_KVM, QEMU_CAPS_DEVICE, @@ -1408,6 +1412,8 @@ mymain(void) DO_TEST("pci-autoadd-addr", QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_PCI_BRIDGE); DO_TEST("pci-autoadd-idx", QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_PCI_BRIDGE); + DO_TEST("pci-many", + QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE_PCI_BRIDGE); DO_TEST("pci-bridge-many-disks", QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE_PCI_BRIDGE); DO_TEST("pcie-root", @@ -1523,7 +1529,7 @@ mymain(void) DO_TEST_FAILURE("shmem-small-size", QEMU_CAPS_PCIDEVICE, QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_IVSHMEM); DO_TEST_PARSE_ERROR("shmem-msi-only", NONE); - DO_TEST("cpu-host-passthrough-features-invalid", QEMU_CAPS_KVM, QEMU_CAPS_CPU_HOST); + DO_TEST("cpu-host-passthrough-features", QEMU_CAPS_KVM, QEMU_CAPS_CPU_HOST); virObjectUnref(driver.config); virObjectUnref(driver.caps); diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pmu-feature.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-pmu-feature.xml new file mode 100644 index 000000000..7f2325393 --- /dev/null +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-pmu-feature.xml @@ -0,0 +1,25 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>6</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='network'/> + </os> + <features> + <acpi/> + <pmu state='on'/> + </features> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <controller type='usb' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index e1ec514b1..4abb30321 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -30,7 +30,10 @@ testCompareXMLToXMLFiles(const char *inxml, const char *outxml, bool live) char *actual = NULL; int ret = -1; virDomainDefPtr def = NULL; - unsigned int flags = live ? 0 : VIR_DOMAIN_XML_INACTIVE; + unsigned int parse_flags = live ? 0 : VIR_DOMAIN_DEF_PARSE_INACTIVE; + unsigned int format_flags = VIR_DOMAIN_DEF_FORMAT_SECURE; + if (!live) + format_flags |= VIR_DOMAIN_DEF_FORMAT_INACTIVE; if (virtTestLoadFile(inxml, &inXmlData) < 0) goto fail; @@ -38,7 +41,7 @@ testCompareXMLToXMLFiles(const char *inxml, const char *outxml, bool live) goto fail; if (!(def = virDomainDefParseString(inXmlData, driver.caps, driver.xmlopt, - QEMU_EXPECTED_VIRT_TYPES, flags))) + QEMU_EXPECTED_VIRT_TYPES, parse_flags))) goto fail; if (!virDomainDefCheckABIStability(def, def)) { @@ -46,7 +49,7 @@ testCompareXMLToXMLFiles(const char *inxml, const char *outxml, bool live) goto fail; } - if (!(actual = virDomainDefFormat(def, VIR_DOMAIN_XML_SECURE | flags))) + if (!(actual = virDomainDefFormat(def, format_flags))) goto fail; if (STRNEQ(outXmlData, actual)) { @@ -184,6 +187,8 @@ mymain(void) DO_TEST("clock-localtime"); DO_TEST("cpu-kvmclock"); DO_TEST("cpu-host-kvmclock"); + DO_TEST("cpu-host-passthrough-features"); + DO_TEST("cpu-host-model-features"); DO_TEST("clock-catchup"); DO_TEST("kvmclock"); DO_TEST("clock-timer-hyperv-rtc"); @@ -201,6 +206,9 @@ mymain(void) DO_TEST("kvm-features"); DO_TEST("kvm-features-off"); + DO_TEST_DIFFERENT("pmu-feature"); + DO_TEST("pmu-feature-off"); + DO_TEST("hugepages"); DO_TEST("hugepages-pages"); DO_TEST("hugepages-pages2"); diff --git a/tests/qemuxmlnstest.c b/tests/qemuxmlnstest.c index 2f37a260b..947aa9ce0 100644 --- a/tests/qemuxmlnstest.c +++ b/tests/qemuxmlnstest.c @@ -56,7 +56,7 @@ static int testCompareXMLToArgvFiles(const char *xml, if (!(vmdef = virDomainDefParseFile(xml, driver.caps, driver.xmlopt, QEMU_EXPECTED_VIRT_TYPES, - VIR_DOMAIN_XML_INACTIVE))) + VIR_DOMAIN_DEF_PARSE_INACTIVE))) goto fail; if (!virDomainDefCheckABIStability(vmdef, vmdef)) { diff --git a/tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml b/tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml index 9b5cc3a49..25a29fd85 100644 --- a/tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml +++ b/tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml @@ -24,7 +24,7 @@ <interface type='bridge'> <mac address='00:11:22:33:44:55'/> <source bridge='xenbr2'/> - <ip address='192.0.2.1'/> + <ip address='192.0.2.1' family='ipv4'/> <script path='vif-bridge'/> <target dev='vif6.0'/> </interface> diff --git a/tests/sexpr2xmldata/sexpr2xml-net-routed.xml b/tests/sexpr2xmldata/sexpr2xml-net-routed.xml index 0ab3b6dd0..c03e40b09 100644 --- a/tests/sexpr2xmldata/sexpr2xml-net-routed.xml +++ b/tests/sexpr2xmldata/sexpr2xml-net-routed.xml @@ -23,7 +23,7 @@ </disk> <interface type='ethernet'> <mac address='00:11:22:33:44:55'/> - <ip address='172.14.5.6'/> + <ip address='172.14.5.6' family='ipv4'/> <script path='vif-routed'/> <target dev='vif6.0'/> </interface> diff --git a/tests/storagepoolxml2xmltest.c b/tests/storagepoolxml2xmltest.c index 52e2193e8..270f75d98 100644 --- a/tests/storagepoolxml2xmltest.c +++ b/tests/storagepoolxml2xmltest.c @@ -106,8 +106,10 @@ mymain(void) DO_TEST("pool-gluster"); DO_TEST("pool-gluster-sub"); DO_TEST("pool-scsi-type-scsi-host-stable"); +#ifdef WITH_STORAGE_ZFS DO_TEST("pool-zfs"); DO_TEST("pool-zfs-sourcedev"); +#endif return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/tests/storagevolxml2xmlin/vol-gluster-dir-neg-uid.xml b/tests/storagevolxml2xmlin/vol-gluster-dir-neg-uid.xml new file mode 100644 index 000000000..f188cebd8 --- /dev/null +++ b/tests/storagevolxml2xmlin/vol-gluster-dir-neg-uid.xml @@ -0,0 +1,17 @@ +<volume type='netdir'> + <name>dir</name> + <key>vol/dir</key> + <source> + </source> + <capacity unit='bytes'>0</capacity> + <allocation unit='bytes'>0</allocation> + <target> + <path>gluster://example.com/vol/dir</path> + <format type='dir'/> + <permissions> + <mode>0600</mode> + <owner>4294967295</owner> + <group>4294967295</group> + </permissions> + </target> +</volume> diff --git a/tests/storagevolxml2xmlout/vol-gluster-dir-neg-uid.xml b/tests/storagevolxml2xmlout/vol-gluster-dir-neg-uid.xml new file mode 100644 index 000000000..538b31d08 --- /dev/null +++ b/tests/storagevolxml2xmlout/vol-gluster-dir-neg-uid.xml @@ -0,0 +1,17 @@ +<volume type='netdir'> + <name>dir</name> + <key>vol/dir</key> + <source> + </source> + <capacity unit='bytes'>0</capacity> + <allocation unit='bytes'>0</allocation> + <target> + <path>gluster://example.com/vol/dir</path> + <format type='dir'/> + <permissions> + <mode>0600</mode> + <owner>-1</owner> + <group>-1</group> + </permissions> + </target> +</volume> diff --git a/tests/storagevolxml2xmlout/vol-gluster-dir.xml b/tests/storagevolxml2xmlout/vol-gluster-dir.xml index f188cebd8..538b31d08 100644 --- a/tests/storagevolxml2xmlout/vol-gluster-dir.xml +++ b/tests/storagevolxml2xmlout/vol-gluster-dir.xml @@ -10,8 +10,8 @@ <format type='dir'/> <permissions> <mode>0600</mode> - <owner>4294967295</owner> - <group>4294967295</group> + <owner>-1</owner> + <group>-1</group> </permissions> </target> </volume> diff --git a/tests/storagevolxml2xmlout/vol-sheepdog.xml b/tests/storagevolxml2xmlout/vol-sheepdog.xml index e08e36c1c..0a1f32c78 100644 --- a/tests/storagevolxml2xmlout/vol-sheepdog.xml +++ b/tests/storagevolxml2xmlout/vol-sheepdog.xml @@ -9,8 +9,8 @@ <format type='unknown'/> <permissions> <mode>0600</mode> - <owner>4294967295</owner> - <group>4294967295</group> + <owner>-1</owner> + <group>-1</group> </permissions> </target> </volume> diff --git a/tests/storagevolxml2xmltest.c b/tests/storagevolxml2xmltest.c index 234a2f1e8..cf4d401bd 100644 --- a/tests/storagevolxml2xmltest.c +++ b/tests/storagevolxml2xmltest.c @@ -122,6 +122,7 @@ mymain(void) DO_TEST("pool-logical", "vol-logical-backing"); DO_TEST("pool-sheepdog", "vol-sheepdog"); DO_TEST("pool-gluster", "vol-gluster-dir"); + DO_TEST("pool-gluster", "vol-gluster-dir-neg-uid"); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/tests/testutilsxen.c b/tests/testutilsxen.c index a50a8a2af..df1d1243b 100644 --- a/tests/testutilsxen.c +++ b/tests/testutilsxen.c @@ -69,3 +69,53 @@ virCapsPtr testXenCapsInit(void) virObjectUnref(caps); return NULL; } + + +virCapsPtr +testXLInitCaps(void) +{ + virCapsPtr caps; + virCapsGuestPtr guest; + virCapsGuestMachinePtr *machines; + int nmachines; + static const char *const x86_machines[] = { + "xenfv" + }; + static const char *const xen_machines[] = { + "xenpv" + }; + + if ((caps = virCapabilitiesNew(virArchFromHost(), + false, false)) == NULL) + return NULL; + nmachines = ARRAY_CARDINALITY(x86_machines); + if ((machines = virCapabilitiesAllocMachines(x86_machines, nmachines)) == NULL) + goto cleanup; + if ((guest = virCapabilitiesAddGuest(caps, "hvm", VIR_ARCH_X86_64, + "/usr/lib/xen/bin/qemu-dm", NULL, + nmachines, machines)) == NULL) + goto cleanup; + machines = NULL; + if (virCapabilitiesAddGuestDomain(guest, "xen", NULL, + NULL, 0, NULL) == NULL) + goto cleanup; + nmachines = ARRAY_CARDINALITY(xen_machines); + if ((machines = virCapabilitiesAllocMachines(xen_machines, nmachines)) == NULL) + goto cleanup; + + if ((guest = virCapabilitiesAddGuest(caps, "xen", VIR_ARCH_X86_64, + "/usr/lib/xen/bin/qemu-dm", NULL, + nmachines, machines)) == NULL) + goto cleanup; + machines = NULL; + + if (virCapabilitiesAddGuestDomain(guest, "xen", NULL, + NULL, 0, NULL) == NULL) + goto cleanup; + return caps; + + cleanup: + virCapabilitiesFreeMachines(machines, nmachines); + virObjectUnref(caps); + return NULL; +} diff --git a/tests/testutilsxen.h b/tests/testutilsxen.h index 54155e5e7..c78350d2d 100644 --- a/tests/testutilsxen.h +++ b/tests/testutilsxen.h @@ -1,3 +1,10 @@ -#include "capabilities.h" +#ifndef _TESTUTILSXEN_H_ +# define _TESTUTILSXEN_H_ + +# include "capabilities.h" virCapsPtr testXenCapsInit(void); + +virCapsPtr testXLInitCaps(void); + +#endif /* _TESTUTILSXEN_H_ */ diff --git a/tests/virfirewalltest.c b/tests/virfirewalltest.c index 81c555743..1f8d8f1e9 100644 --- a/tests/virfirewalltest.c +++ b/tests/virfirewalltest.c @@ -1168,6 +1168,8 @@ mymain(void) RUN_TEST_DIRECT(name, method) # endif /* ! WITH_DBUS */ + virFirewallSetLockOverride(true); + RUN_TEST("single group", testFirewallSingleGroup); RUN_TEST("remove rule", testFirewallRemoveRule); RUN_TEST("many groups", testFirewallManyGroups); diff --git a/tests/virnetdevbandwidthtest.c b/tests/virnetdevbandwidthtest.c index cd24442ab..3b4645533 100644 --- a/tests/virnetdevbandwidthtest.c +++ b/tests/virnetdevbandwidthtest.c @@ -43,6 +43,7 @@ struct testSetStruct { #define PARSE(xml, var) \ do { \ + int rc; \ xmlDocPtr doc; \ xmlXPathContextPtr ctxt = NULL; \ \ @@ -54,11 +55,12 @@ struct testSetStruct { &ctxt))) \ goto cleanup; \ \ - (var) = virNetDevBandwidthParse(ctxt->node, \ - VIR_DOMAIN_NET_TYPE_NETWORK); \ + rc = virNetDevBandwidthParse(&(var), \ + ctxt->node, \ + VIR_DOMAIN_NET_TYPE_NETWORK); \ xmlFreeDoc(doc); \ xmlXPathFreeContext(ctxt); \ - if (!(var)) \ + if (rc < 0) \ goto cleanup; \ } while (0) @@ -127,9 +129,7 @@ mymain(void) DO_TEST_SET(NULL, NULL); - DO_TEST_SET(("<bandwidth/>"), - (TC " qdisc del dev eth0 root\n" - TC " qdisc del dev eth0 ingress\n")); + DO_TEST_SET("<bandwidth/>", NULL); DO_TEST_SET(("<bandwidth>" " <inbound average='1024'/>" diff --git a/tests/virsystemdtest.c b/tests/virsystemdtest.c index 0d57a6aae..261c4cc34 100644 --- a/tests/virsystemdtest.c +++ b/tests/virsystemdtest.c @@ -146,6 +146,7 @@ static int testCreateContainer(const void *opaque ATTRIBUTE_UNUSED) "/proc/123/root", 123, true, + 0, NULL, "highpriority.slice") < 0) { fprintf(stderr, "%s", "Failed to create LXC machine\n"); return -1; @@ -181,6 +182,7 @@ static int testCreateMachine(const void *opaque ATTRIBUTE_UNUSED) NULL, 123, false, + 0, NULL, NULL) < 0) { fprintf(stderr, "%s", "Failed to create KVM machine\n"); return -1; @@ -220,6 +222,7 @@ static int testCreateNoSystemd(const void *opaque ATTRIBUTE_UNUSED) NULL, 123, false, + 0, NULL, NULL)) == 0) { unsetenv("FAIL_NO_SERVICE"); fprintf(stderr, "%s", "Unexpected create machine success\n"); @@ -254,6 +257,7 @@ static int testCreateSystemdNotRunning(const void *opaque ATTRIBUTE_UNUSED) NULL, 123, false, + 0, NULL, NULL)) == 0) { unsetenv("FAIL_NOT_REGISTERED"); fprintf(stderr, "%s", "Unexpected create machine success\n"); @@ -288,6 +292,7 @@ static int testCreateBadSystemd(const void *opaque ATTRIBUTE_UNUSED) NULL, 123, false, + 0, NULL, NULL)) == 0) { unsetenv("FAIL_BAD_SERVICE"); fprintf(stderr, "%s", "Unexpected create machine success\n"); @@ -304,6 +309,35 @@ static int testCreateBadSystemd(const void *opaque ATTRIBUTE_UNUSED) } +static int testCreateNetwork(const void *opaque ATTRIBUTE_UNUSED) +{ + unsigned char uuid[VIR_UUID_BUFLEN] = { + 1, 1, 1, 1, + 2, 2, 2, 2, + 3, 3, 3, 3, + 4, 4, 4, 4 + }; + int nicindexes[] = { + 2, 1729, 87539319, + }; + size_t nnicindexes = ARRAY_CARDINALITY(nicindexes); + if (virSystemdCreateMachine("demo", + "lxc", + true, + uuid, + "/proc/123/root", + 123, + true, + nnicindexes, nicindexes, + "highpriority.slice") < 0) { + fprintf(stderr, "%s", "Failed to create LXC machine\n"); + return -1; + } + + return 0; +} + + struct testScopeData { const char *name; const char *partition; @@ -435,6 +469,8 @@ mymain(void) ret = -1; if (virtTestRun("Test create bad systemd ", testCreateBadSystemd, NULL) < 0) ret = -1; + if (virtTestRun("Test create with network ", testCreateNetwork, NULL) < 0) + ret = -1; # define TEST_SCOPE(name, partition, unitname) \ do { \ diff --git a/tests/vmx2xmldata/vmx2xml-serial-device.vmx b/tests/vmx2xmldata/vmx2xml-serial-device.vmx index 8c101e311..927f408fb 100644 --- a/tests/vmx2xmldata/vmx2xml-serial-device.vmx +++ b/tests/vmx2xmldata/vmx2xml-serial-device.vmx @@ -3,3 +3,5 @@ virtualHW.version = "4" serial0.present = "true" serial0.fileType = "device" serial0.fileName = "/dev/ttyS0" +serial1.present = "true" +serial1.fileName = "/dev/ttyS1" diff --git a/tests/vmx2xmldata/vmx2xml-serial-device.xml b/tests/vmx2xmldata/vmx2xml-serial-device.xml index 9ecd867f3..cc45c078e 100644 --- a/tests/vmx2xmldata/vmx2xml-serial-device.xml +++ b/tests/vmx2xmldata/vmx2xml-serial-device.xml @@ -15,6 +15,10 @@ <source path='/dev/ttyS0'/> <target port='0'/> </serial> + <serial type='dev'> + <source path='/dev/ttyS1'/> + <target port='1'/> + </serial> <console type='dev'> <source path='/dev/ttyS0'/> <target type='serial' port='0'/> diff --git a/tests/vmx2xmltest.c b/tests/vmx2xmltest.c index 6b1e724bc..412be8830 100644 --- a/tests/vmx2xmltest.c +++ b/tests/vmx2xmltest.c @@ -90,7 +90,7 @@ testCompareFiles(const char *vmx, const char *xml) goto cleanup; } - if (!(formatted = virDomainDefFormat(def, VIR_DOMAIN_XML_SECURE))) + if (!(formatted = virDomainDefFormat(def, VIR_DOMAIN_DEF_FORMAT_SECURE))) goto cleanup; if (STRNEQ(xmlData, formatted)) { diff --git a/tests/xencapsdata/xen-i686-pae-hvm.xml b/tests/xencapsdata/xen-i686-pae-hvm.xml index 872e5f669..cf6a1de6e 100644 --- a/tests/xencapsdata/xen-i686-pae-hvm.xml +++ b/tests/xencapsdata/xen-i686-pae-hvm.xml @@ -22,8 +22,7 @@ <wordsize>32</wordsize> <emulator>/usr/lib/xen/bin/qemu-dm</emulator> <machine>xenpv</machine> - <domain type='xen'> - </domain> + <domain type='xen'/> </arch> <features> <pae/> @@ -37,8 +36,7 @@ <emulator>/usr/lib/xen/bin/qemu-dm</emulator> <loader>/usr/lib/xen/boot/hvmloader</loader> <machine>xenfv</machine> - <domain type='xen'> - </domain> + <domain type='xen'/> </arch> <features> <pae/> diff --git a/tests/xencapsdata/xen-i686-pae.xml b/tests/xencapsdata/xen-i686-pae.xml index 3dba6ebbc..c917fbe72 100644 --- a/tests/xencapsdata/xen-i686-pae.xml +++ b/tests/xencapsdata/xen-i686-pae.xml @@ -22,8 +22,7 @@ <wordsize>32</wordsize> <emulator>/usr/lib/xen/bin/qemu-dm</emulator> <machine>xenpv</machine> - <domain type='xen'> - </domain> + <domain type='xen'/> </arch> <features> <pae/> diff --git a/tests/xencapsdata/xen-i686.xml b/tests/xencapsdata/xen-i686.xml index 22d7685fc..5771e2bcf 100644 --- a/tests/xencapsdata/xen-i686.xml +++ b/tests/xencapsdata/xen-i686.xml @@ -19,8 +19,7 @@ <wordsize>32</wordsize> <emulator>/usr/lib/xen/bin/qemu-dm</emulator> <machine>xenpv</machine> - <domain type='xen'> - </domain> + <domain type='xen'/> </arch> <features> <nonpae/> diff --git a/tests/xencapsdata/xen-ia64-be-hvm.xml b/tests/xencapsdata/xen-ia64-be-hvm.xml index 222de1dad..19d23e940 100644 --- a/tests/xencapsdata/xen-ia64-be-hvm.xml +++ b/tests/xencapsdata/xen-ia64-be-hvm.xml @@ -19,8 +19,7 @@ <wordsize>64</wordsize> <emulator>/usr/lib/xen/bin/qemu-dm</emulator> <machine>xenpv</machine> - <domain type='xen'> - </domain> + <domain type='xen'/> </arch> <features> <ia64_be/> @@ -34,8 +33,7 @@ <emulator>/usr/lib/xen/bin/qemu-dm</emulator> <loader>/usr/lib/xen/boot/hvmloader</loader> <machine>xenfv</machine> - <domain type='xen'> - </domain> + <domain type='xen'/> </arch> <features> <ia64_be/> diff --git a/tests/xencapsdata/xen-ia64-be.xml b/tests/xencapsdata/xen-ia64-be.xml index 017816c4d..78fa77e69 100644 --- a/tests/xencapsdata/xen-ia64-be.xml +++ b/tests/xencapsdata/xen-ia64-be.xml @@ -19,8 +19,7 @@ <wordsize>64</wordsize> <emulator>/usr/lib/xen/bin/qemu-dm</emulator> <machine>xenpv</machine> - <domain type='xen'> - </domain> + <domain type='xen'/> </arch> <features> <ia64_be/> diff --git a/tests/xencapsdata/xen-ia64-hvm.xml b/tests/xencapsdata/xen-ia64-hvm.xml index 33c49469c..6e2237217 100644 --- a/tests/xencapsdata/xen-ia64-hvm.xml +++ b/tests/xencapsdata/xen-ia64-hvm.xml @@ -19,8 +19,7 @@ <wordsize>64</wordsize> <emulator>/usr/lib/xen/bin/qemu-dm</emulator> <machine>xenpv</machine> - <domain type='xen'> - </domain> + <domain type='xen'/> </arch> </guest> @@ -31,8 +30,7 @@ <emulator>/usr/lib/xen/bin/qemu-dm</emulator> <loader>/usr/lib/xen/boot/hvmloader</loader> <machine>xenfv</machine> - <domain type='xen'> - </domain> + <domain type='xen'/> </arch> <features> <acpi default='on' toggle='yes'/> diff --git a/tests/xencapsdata/xen-ia64.xml b/tests/xencapsdata/xen-ia64.xml index 82ce96562..9e3eaf435 100644 --- a/tests/xencapsdata/xen-ia64.xml +++ b/tests/xencapsdata/xen-ia64.xml @@ -19,8 +19,7 @@ <wordsize>64</wordsize> <emulator>/usr/lib/xen/bin/qemu-dm</emulator> <machine>xenpv</machine> - <domain type='xen'> - </domain> + <domain type='xen'/> </arch> </guest> diff --git a/tests/xencapsdata/xen-ppc64.xml b/tests/xencapsdata/xen-ppc64.xml index 91401b938..0132c459c 100644 --- a/tests/xencapsdata/xen-ppc64.xml +++ b/tests/xencapsdata/xen-ppc64.xml @@ -19,8 +19,7 @@ <wordsize>64</wordsize> <emulator>/usr/lib/xen/bin/qemu-dm</emulator> <machine>xenpv</machine> - <domain type='xen'> - </domain> + <domain type='xen'/> </arch> </guest> diff --git a/tests/xencapsdata/xen-x86_64-hvm.xml b/tests/xencapsdata/xen-x86_64-hvm.xml index 8de8cf446..7458f0b53 100644 --- a/tests/xencapsdata/xen-x86_64-hvm.xml +++ b/tests/xencapsdata/xen-x86_64-hvm.xml @@ -22,8 +22,7 @@ <wordsize>64</wordsize> <emulator>/usr/lib64/xen/bin/qemu-dm</emulator> <machine>xenpv</machine> - <domain type='xen'> - </domain> + <domain type='xen'/> </arch> </guest> @@ -34,8 +33,7 @@ <emulator>/usr/lib64/xen/bin/qemu-dm</emulator> <loader>/usr/lib/xen/boot/hvmloader</loader> <machine>xenfv</machine> - <domain type='xen'> - </domain> + <domain type='xen'/> </arch> <features> <pae/> @@ -52,8 +50,7 @@ <emulator>/usr/lib64/xen/bin/qemu-dm</emulator> <loader>/usr/lib/xen/boot/hvmloader</loader> <machine>xenfv</machine> - <domain type='xen'> - </domain> + <domain type='xen'/> </arch> <features> <acpi default='on' toggle='yes'/> diff --git a/tests/xencapsdata/xen-x86_64.xml b/tests/xencapsdata/xen-x86_64.xml index 0c3279bb2..b6864320b 100644 --- a/tests/xencapsdata/xen-x86_64.xml +++ b/tests/xencapsdata/xen-x86_64.xml @@ -22,8 +22,7 @@ <wordsize>64</wordsize> <emulator>/usr/lib64/xen/bin/qemu-dm</emulator> <machine>xenpv</machine> - <domain type='xen'> - </domain> + <domain type='xen'/> </arch> </guest> diff --git a/tests/xlconfigdata/test-new-disk.cfg b/tests/xlconfigdata/test-new-disk.cfg new file mode 100644 index 000000000..b672b4ad3 --- /dev/null +++ b/tests/xlconfigdata/test-new-disk.cfg @@ -0,0 +1,26 @@ +name = "XenGuest2" +uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809" +maxmem = 579 +memory = 394 +vcpus = 1 +builder = "hvm" +kernel = "/usr/lib/xen/boot/hvmloader" +boot = "d" +pae = 1 +acpi = 1 +apic = 1 +hap = 0 +viridian = 0 +localtime = 0 +on_poweroff = "destroy" +on_reboot = "restart" +on_crash = "restart" +device_model = "/usr/lib/xen/bin/qemu-dm" +sdl = 0 +vnc = 1 +vncunused = 1 +vnclisten = "127.0.0.1" +vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ] +parallel = "none" +serial = "none" +disk = [ "/dev/HostVG/XenGuest2,raw,hda,w,backendtype=phy", "/var/lib/libvirt/images/XenGuest2-home,qcow2,hdb,w,backendtype=qdisk", "/root/boot.iso,raw,hdc,r,backendtype=qdisk,devtype=cdrom" ] diff --git a/tests/xlconfigdata/test-new-disk.xml b/tests/xlconfigdata/test-new-disk.xml new file mode 100644 index 000000000..1c96a62e5 --- /dev/null +++ b/tests/xlconfigdata/test-new-disk.xml @@ -0,0 +1,51 @@ +<domain type='xen'> + <name>XenGuest2</name> + <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>592896</memory> + <currentMemory unit='KiB'>403456</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='xenfv'>hvm</type> + <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader> + <boot dev='cdrom'/> + </os> + <features> + <acpi/> + <apic/> + <pae/> + </features> + <clock offset='utc' adjustment='reset'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + <devices> + <emulator>/usr/lib/xen/bin/qemu-dm</emulator> + <disk type='block' device='disk'> + <driver name='phy' type='raw'/> + <source dev='/dev/HostVG/XenGuest2'/> + <target dev='hda' bus='ide'/> + </disk> + <disk type='file' device='disk'> + <driver name='qemu' type='qcow2'/> + <source file='/var/lib/libvirt/images/XenGuest2-home'/> + <target dev='hdb' bus='ide'/> + </disk> + <disk type='file' device='cdrom'> + <driver name='qemu' type='raw'/> + <source file='/root/boot.iso'/> + <target dev='hdc' bus='ide'/> + <readonly/> + </disk> + <interface type='bridge'> + <mac address='00:16:3e:66:92:9c'/> + <source bridge='xenbr1'/> + <script path='vif-bridge'/> + <model type='e1000'/> + </interface> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1'> + <listen type='address' address='127.0.0.1'/> + </graphics> + </devices> +</domain> diff --git a/tests/xlconfigdata/test-spice.cfg b/tests/xlconfigdata/test-spice.cfg new file mode 100644 index 000000000..49aff631a --- /dev/null +++ b/tests/xlconfigdata/test-spice.cfg @@ -0,0 +1,31 @@ +name = "XenGuest2" +uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809" +maxmem = 579 +memory = 394 +vcpus = 1 +builder = "hvm" +kernel = "/usr/lib/xen/boot/hvmloader" +boot = "d" +pae = 1 +acpi = 1 +apic = 1 +hap = 0 +viridian = 0 +localtime = 0 +on_poweroff = "destroy" +on_reboot = "restart" +on_crash = "restart" +device_model = "/usr/lib/xen/bin/qemu-dm" +vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ] +parallel = "none" +serial = "none" +disk = [ "/dev/HostVG/XenGuest2,raw,hda,w,backendtype=phy", "/root/boot.iso,raw,hdc,r,backendtype=qdisk,devtype=cdrom" ] +sdl = 0 +vnc = 0 +spice = 1 +spiceport = 590 +spicetls_port = 500 +spicedisable_ticketing = 1 +spicepasswd = "thebeast" +spicehost = "127.0.0.1" +spiceagent_mouse = 0 diff --git a/tests/xlconfigdata/test-spice.xml b/tests/xlconfigdata/test-spice.xml new file mode 100644 index 000000000..bd004fcd4 --- /dev/null +++ b/tests/xlconfigdata/test-spice.xml @@ -0,0 +1,46 @@ +<domain type='xen'> + <name>XenGuest2</name> + <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>592896</memory> + <currentMemory unit='KiB'>403456</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='xenfv'>hvm</type> + <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader> + <boot dev='cdrom'/> + </os> + <features> + <acpi/> + <apic/> + <pae/> + </features> + <clock offset='utc' adjustment='reset'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + <devices> + <emulator>/usr/lib/xen/bin/qemu-dm</emulator> + <disk type='block' device='disk'> + <driver name='phy' type='raw'/> + <source dev='/dev/HostVG/XenGuest2'/> + <target dev='hda' bus='ide'/> + </disk> + <disk type='file' device='cdrom'> + <driver name='qemu' type='raw'/> + <source file='/root/boot.iso'/> + <target dev='hdc' bus='ide'/> + <readonly/> + </disk> + <interface type='bridge'> + <mac address='00:16:3e:66:92:9c'/> + <source bridge='xenbr1'/> + <script path='vif-bridge'/> + <model type='e1000'/> + </interface> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <graphics type='spice' port='590' tlsPort='500' autoport='no' listen='127.0.0.1' passwd='thebeast'> + <listen type='address' address='127.0.0.1'/> + </graphics> + </devices> +</domain> diff --git a/tests/xlconfigtest.c b/tests/xlconfigtest.c new file mode 100644 index 000000000..c2763c03f --- /dev/null +++ b/tests/xlconfigtest.c @@ -0,0 +1,225 @@ +/* + * xlconfigtest.c: Test backend for xl_internal config file handling + * + * Copyright (C) 2007, 2010-2011, 2014 Red Hat, Inc. + * Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Author: Daniel P. Berrange <berrange@redhat.com> + * Author: Kiarie Kahurani <davidkiarie4@gmail.com> + * + */ + +#include <config.h> + +#include <stdio.h> +#include <string.h> +#include <unistd.h> + +#include "internal.h" +#include "datatypes.h" +#include "xenconfig/xen_xl.h" +#include "viralloc.h" +#include "virstring.h" +#include "testutils.h" +#include "testutilsxen.h" +#include "xen/xen_driver.h" + +#define VIR_FROM_THIS VIR_FROM_NONE + +static virCapsPtr caps; +static virDomainXMLOptionPtr xmlopt; +/* + * parses the xml, creates a domain def and compare with equivalent xm config + */ +static int +testCompareParseXML(const char *xmcfg, const char *xml, int xendConfigVersion) +{ + char *xmlData = NULL; + char *xmcfgData = NULL; + char *gotxmcfgData = NULL; + virConfPtr conf = NULL; + virConnectPtr conn = NULL; + int wrote = 4096; + int ret = -1; + virDomainDefPtr def = NULL; + + if (VIR_ALLOC_N(gotxmcfgData, wrote) < 0) + goto fail; + + conn = virGetConnect(); + if (!conn) goto fail; + + if (virtTestLoadFile(xml, &xmlData) < 0) + goto fail; + + if (virtTestLoadFile(xmcfg, &xmcfgData) < 0) + goto fail; + + if (!(def = virDomainDefParseString(xmlData, caps, xmlopt, + 1 << VIR_DOMAIN_VIRT_XEN, + VIR_DOMAIN_XML_INACTIVE))) + goto fail; + + if (!virDomainDefCheckABIStability(def, def)) { + fprintf(stderr, "ABI stability check failed on %s", xml); + goto fail; + } + + if (!(conf = xenFormatXL(def, conn, xendConfigVersion))) + goto fail; + + if (virConfWriteMem(gotxmcfgData, &wrote, conf) < 0) + goto fail; + gotxmcfgData[wrote] = '\0'; + + if (STRNEQ(xmcfgData, gotxmcfgData)) { + virtTestDifference(stderr, xmcfgData, gotxmcfgData); + goto fail; + } + + ret = 0; + + fail: + VIR_FREE(xmlData); + VIR_FREE(xmcfgData); + VIR_FREE(gotxmcfgData); + if (conf) + virConfFree(conf); + virDomainDefFree(def); + virObjectUnref(conn); + + return ret; +} +/* + * parses the xl config, develops domain def and compares with equivalent xm config + */ +static int +testCompareFormatXML(const char *xmcfg, const char *xml, int xendConfigVersion) +{ + char *xmlData = NULL; + char *xmcfgData = NULL; + char *gotxml = NULL; + virConfPtr conf = NULL; + int ret = -1; + virConnectPtr conn; + virDomainDefPtr def = NULL; + + conn = virGetConnect(); + if (!conn) goto fail; + + if (virtTestLoadFile(xml, &xmlData) < 0) + goto fail; + + if (virtTestLoadFile(xmcfg, &xmcfgData) < 0) + goto fail; + + if (!(conf = virConfReadMem(xmcfgData, strlen(xmcfgData), 0))) + goto fail; + + if (!(def = xenParseXL(conf, caps, xendConfigVersion))) + goto fail; + + if (!(gotxml = virDomainDefFormat(def, VIR_DOMAIN_XML_INACTIVE | + VIR_DOMAIN_XML_SECURE))) + goto fail; + + if (STRNEQ(xmlData, gotxml)) { + virtTestDifference(stderr, xmlData, gotxml); + goto fail; + } + + ret = 0; + + fail: + if (conf) + virConfFree(conf); + VIR_FREE(xmlData); + VIR_FREE(xmcfgData); + VIR_FREE(gotxml); + virDomainDefFree(def); + virObjectUnref(conn); + + return ret; +} + + +struct testInfo { + const char *name; + int version; + int mode; +}; + +static int +testCompareHelper(const void *data) +{ + int result = -1; + const struct testInfo *info = data; + char *xml = NULL; + char *cfg = NULL; + + if (virAsprintf(&xml, "%s/xlconfigdata/test-%s.xml", + abs_srcdir, info->name) < 0 || + virAsprintf(&cfg, "%s/xlconfigdata/test-%s.cfg", + abs_srcdir, info->name) < 0) + goto cleanup; + + if (info->mode == 0) + result = testCompareParseXML(cfg, xml, info->version); + else + result = testCompareFormatXML(cfg, xml, info->version); + + cleanup: + VIR_FREE(xml); + VIR_FREE(cfg); + + return result; +} + + +static int +mymain(void) +{ + int ret = 0; + + if (!(caps = testXLInitCaps())) + return EXIT_FAILURE; + + if (!(xmlopt = xenDomainXMLConfInit())) + return EXIT_FAILURE; + +#define DO_TEST(name, version) \ + do { \ + struct testInfo info0 = { name, version, 0 }; \ + struct testInfo info1 = { name, version, 1 }; \ + if (virtTestRun("Xen XM-2-XML Parse " name, \ + testCompareHelper, &info0) < 0) \ + ret = -1; \ + if (virtTestRun("Xen XM-2-XML Format " name, \ + testCompareHelper, &info1) < 0) \ + ret = -1; \ + } while (0) + + DO_TEST("new-disk", 3); + DO_TEST("spice", 3); + + virObjectUnref(caps); + virObjectUnref(xmlopt); + + return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; +} + +VIRT_TEST_MAIN(mymain) diff --git a/tests/xmconfigdata/test-fullvirt-default-feature.cfg b/tests/xmconfigdata/test-fullvirt-default-feature.cfg new file mode 100644 index 000000000..5ce234f0a --- /dev/null +++ b/tests/xmconfigdata/test-fullvirt-default-feature.cfg @@ -0,0 +1,23 @@ +name = "XenGuest2" +uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809" +maxmem = 579 +memory = 394 +vcpus = 1 +builder = "hvm" +kernel = "/usr/lib/xen/boot/hvmloader" +boot = "d" +hpet = 1 +localtime = 0 +on_poweroff = "destroy" +on_reboot = "restart" +on_crash = "restart" +device_model = "/usr/lib/xen/bin/qemu-dm" +sdl = 0 +vnc = 1 +vncunused = 1 +vnclisten = "127.0.0.1" +vncpasswd = "123poi" +vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ] +parallel = "none" +serial = "none" +disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso,hdc:cdrom,r" ] diff --git a/tests/xmconfigdata/test-fullvirt-default-feature.xml b/tests/xmconfigdata/test-fullvirt-default-feature.xml new file mode 100644 index 000000000..57a6531c4 --- /dev/null +++ b/tests/xmconfigdata/test-fullvirt-default-feature.xml @@ -0,0 +1,48 @@ +<domain type='xen'> + <name>XenGuest2</name> + <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>592896</memory> + <currentMemory unit='KiB'>403456</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='xenfv'>hvm</type> + <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader> + <boot dev='cdrom'/> + </os> + <features> + <acpi/> + <apic/> + <pae/> + </features> + <clock offset='utc' adjustment='reset'> + <timer name='hpet' present='yes'/> + </clock> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + <devices> + <emulator>/usr/lib/xen/bin/qemu-dm</emulator> + <disk type='block' device='disk'> + <driver name='phy'/> + <source dev='/dev/HostVG/XenGuest2'/> + <target dev='hda' bus='ide'/> + </disk> + <disk type='file' device='cdrom'> + <driver name='file'/> + <source file='/root/boot.iso'/> + <target dev='hdc' bus='ide'/> + <readonly/> + </disk> + <interface type='bridge'> + <mac address='00:16:3e:66:92:9c'/> + <source bridge='xenbr1'/> + <script path='vif-bridge'/> + <model type='e1000'/> + </interface> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'> + <listen type='address' address='127.0.0.1'/> + </graphics> + </devices> +</domain> diff --git a/tests/xmconfigtest.c b/tests/xmconfigtest.c index 0c6f80358..00a05ee6c 100644 --- a/tests/xmconfigtest.c +++ b/tests/xmconfigtest.c @@ -74,7 +74,7 @@ testCompareParseXML(const char *xmcfg, const char *xml, int xendConfigVersion) if (!(def = virDomainDefParseString(xmlData, caps, xmlopt, 1 << VIR_DOMAIN_VIRT_XEN, - VIR_DOMAIN_XML_INACTIVE))) + VIR_DOMAIN_DEF_PARSE_INACTIVE))) goto fail; if (!virDomainDefCheckABIStability(def, def)) { @@ -140,7 +140,7 @@ testCompareFormatXML(const char *xmcfg, const char *xml, int xendConfigVersion) if (!(def = xenParseXM(conf, priv.xendConfigVersion, priv.caps))) goto fail; - if (!(gotxml = virDomainDefFormat(def, VIR_DOMAIN_XML_SECURE))) + if (!(gotxml = virDomainDefFormat(def, VIR_DOMAIN_DEF_FORMAT_SECURE))) goto fail; if (STRNEQ(xmlData, gotxml)) { @@ -176,6 +176,7 @@ testCompareHelper(const void *data) const struct testInfo *info = data; char *xml = NULL; char *cfg = NULL; + char *cfgout = NULL; if (virAsprintf(&xml, "%s/xmconfigdata/test-%s.xml", abs_srcdir, info->name) < 0 || @@ -191,6 +192,7 @@ testCompareHelper(const void *data) cleanup: VIR_FREE(xml); VIR_FREE(cfg); + VIR_FREE(cfgout); return result; } @@ -207,18 +209,30 @@ mymain(void) if (!(xmlopt = xenDomainXMLConfInit())) return EXIT_FAILURE; -#define DO_TEST(name, version) \ +#define DO_TEST_PARSE(name, version) \ do { \ struct testInfo info0 = { name, version, 0 }; \ - struct testInfo info1 = { name, version, 1 }; \ if (virtTestRun("Xen XM-2-XML Parse " name, \ testCompareHelper, &info0) < 0) \ ret = -1; \ + } while (0) + + +#define DO_TEST_FORMAT(name, version) \ + do { \ + struct testInfo info1 = { name, version, 1 }; \ if (virtTestRun("Xen XM-2-XML Format " name, \ testCompareHelper, &info1) < 0) \ ret = -1; \ } while (0) + +#define DO_TEST(name, version) \ + do { \ + DO_TEST_PARSE(name, version); \ + DO_TEST_FORMAT(name, version); \ + } while (0) + DO_TEST("paravirt-old-pvfb", 1); DO_TEST("paravirt-old-pvfb-vncdisplay", 1); DO_TEST("paravirt-new-pvfb", 3); @@ -254,6 +268,8 @@ mymain(void) DO_TEST("fullvirt-net-ioemu", 2); DO_TEST("fullvirt-net-netfront", 2); + DO_TEST_FORMAT("fullvirt-default-feature", 2); + DO_TEST("escape-paths", 2); DO_TEST("no-source-cdrom", 2); DO_TEST("pci-devs", 2); diff --git a/tests/xml2sexprtest.c b/tests/xml2sexprtest.c index 7d9e780f9..f65eaefb3 100644 --- a/tests/xml2sexprtest.c +++ b/tests/xml2sexprtest.c @@ -37,7 +37,7 @@ testCompareFiles(const char *xml, const char *sexpr, int xendConfigVersion) if (!(def = virDomainDefParseString(xmlData, caps, xmlopt, 1 << VIR_DOMAIN_VIRT_XEN, - VIR_DOMAIN_XML_INACTIVE))) + VIR_DOMAIN_DEF_PARSE_INACTIVE))) goto fail; if (!virDomainDefCheckABIStability(def, def)) { diff --git a/tests/xml2vmxtest.c b/tests/xml2vmxtest.c index ca9445df2..2d72407e4 100644 --- a/tests/xml2vmxtest.c +++ b/tests/xml2vmxtest.c @@ -86,7 +86,7 @@ testCompareFiles(const char *xml, const char *vmx, int virtualHW_version) def = virDomainDefParseString(xmlData, caps, xmlopt, 1 << VIR_DOMAIN_VIRT_VMWARE, - VIR_DOMAIN_XML_INACTIVE); + VIR_DOMAIN_DEF_PARSE_INACTIVE); if (def == NULL) goto failure; |