From 7795712ddcb8c3744c94e3154c99eb78193c89cc Mon Sep 17 00:00:00 2001
From: Matt Coleman <mcoleman@datto.com>
Date: Mon, 2 Nov 2020 19:22:08 -0500
Subject: [PATCH] hyperv: call openwsman's ws_serializer_free_mem
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 | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/src/hyperv/hyperv_wmi.c b/src/hyperv/hyperv_wmi.c
index f2c7c365fa..1d0d33ec6d 100644
--- a/src/hyperv/hyperv_wmi.c
+++ b/src/hyperv/hyperv_wmi.c
@@ -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);