]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
hyperv: call openwsman's ws_serializer_free_mem
authorMatt Coleman <mcoleman@datto.com>
Tue, 3 Nov 2020 00:22:08 +0000 (19:22 -0500)
committerMichal Privoznik <mprivozn@redhat.com>
Tue, 3 Nov 2020 10:30:11 +0000 (11:30 +0100)
This should have been included with the upgrade to openwsman 2.6.3.

Signed-off-by: Matt Coleman <matt@datto.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
src/hyperv/hyperv_wmi.c

index f2c7c365fada28791f1b846a8b47f10add0ccf2b..1d0d33ec6d7266ac34513d803154b9fa5b80274b 100644 (file)
@@ -41,8 +41,6 @@
 #include "virlog.h"
 #include "virxml.h"
 
-#define WS_SERIALIZER_FREE_MEM_WORKS 0
-
 #define VIR_FROM_THIS VIR_FROM_HYPERV
 
 #define HYPERV_JOB_TIMEOUT_MS 300000
@@ -1120,12 +1118,10 @@ hypervEnumAndPull(hypervPrivate *priv, hypervWqlQueryPtr wqlQuery,
         filter_destroy(filter);
 
     if (data != NULL) {
-#if WS_SERIALIZER_FREE_MEM_WORKS
         if (ws_serializer_free_mem(serializerContext, data,
                                    wmiInfo->serializerInfo) < 0) {
             VIR_ERROR(_("Could not free deserialized data"));
         }
-#endif
     }
 
     VIR_FREE(query_string);
@@ -1141,26 +1137,20 @@ void
 hypervFreeObject(hypervPrivate *priv G_GNUC_UNUSED, hypervObject *object)
 {
     hypervObject *next;
-#if WS_SERIALIZER_FREE_MEM_WORKS
     WsSerializerContextH serializerContext;
-#endif
 
     if (object == NULL)
         return;
 
-#if WS_SERIALIZER_FREE_MEM_WORKS
     serializerContext = wsmc_get_serialization_context(priv->client);
-#endif
 
     while (object != NULL) {
         next = object->next;
 
-#if WS_SERIALIZER_FREE_MEM_WORKS
         if (ws_serializer_free_mem(serializerContext, object->data.common,
                                    object->info->serializerInfo) < 0) {
             VIR_ERROR(_("Could not free deserialized data"));
         }
-#endif
 
         VIR_FREE(object);