tests: Adjust libxlxml2domconfigtest to work with Xen < 4.8

Commit fcdc387410fadfb066b95395c5b5d2a6a16f7066 used a libxl API which
is only available since Xen 4.8.

Due to lack of a specific guard for this API change, reuse another
guard from libxl.h.

Signed-off-by: Olaf Hering <olaf@aepfle.de>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Reviewed-by: Jim Fehlig <jfehlig@suse.com>

diff --git a/tests/libxlxml2domconfigtest.c b/tests/libxlxml2domconfigtest.c
index d58be1211b20b41bc2de94a5cef80425fa0d034e..3c133ac6f0538d5bfbc8a0e11c47fbae529249ae 100644 (file)
--- a/tests/libxlxml2domconfigtest.c
+++ b/tests/libxlxml2domconfigtest.c
@@ -105,7 +105,13 @@ testCompareXMLToDomConfig(const char *xmlfile,
      */
 # ifndef LIBXL_HAVE_BUILDINFO_APIC
     if (expectconfig.c_info.type == LIBXL_DOMAIN_TYPE_HVM) {
+#  ifdef LIBXL_HAVE_MEMKB_64BITS
+        /*
+         * This part of the libxl API was changed without a guard in Xen 4.8.
+         * Reuse another Xen 4.8 specific conditional.
+         */
         libxl_defbool_unset(&expectconfig.b_info.acpi);
+#  endif
         libxl_defbool_set(&expectconfig.b_info.u.hvm.apic, true);
         libxl_defbool_set(&expectconfig.b_info.u.hvm.acpi, true);
     }