File libvirt.f07ae0fcbd84f52da6660a7ad0b19c99f6a6f9d... of Package libvirt-7.0.0

Overview Repositories Revisions Requests Users Attributes Meta

File libvirt.f07ae0fcbd84f52da6660a7ad0b19c99f6a6f9d6.patch of Package libvirt-7.0.0

From: Olaf Hering <olaf@aepfle.de>
Date: Mon, 8 Mar 2021 14:29:31 +0100
Subject: f07ae0fcbd84f52da6660a7ad0b19c99f6a6f9d6

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>
---
 tests/libxlxml2domconfigtest.c | 6 ++++++
 1 file changed, 6 insertions(+)

--- a/tests/libxlxml2domconfigtest.c
+++ b/tests/libxlxml2domconfigtest.c
@@ -96,25 +96,31 @@ testCompareXMLToDomConfig(const char *xmlfile,
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
                        "Failed to create libxl_domain_config from JSON doc");
         goto cleanup;
     }
 
     /*
      * In order to have common test files between Xen 4.9 and newer Xen versions,
      * tweak the expected libxl_domain_config object before getting a json
      * representation.
      */
 # 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);
     }
 # endif
 
     if (!(expectjson = libxl_domain_config_to_json(cfg->ctx, &expectconfig))) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
                        "Failed to retrieve JSON doc for libxl_domain_config");
         goto cleanup;
     }
 
     if (virTestCompareToString(expectjson, actualjson) < 0)

Places

File libvirt.f07ae0fcbd84f52da6660a7ad0b19c99f6a6f9d6.patch of Package libvirt-7.0.0

Places