hyperv: remove openwsman.h

This header's main purpose was to work around bugs in older versions of
openwsman. Most of the files using it only needed wsman-api.h, which
they now include directly.

Signed-off-by: Matt Coleman <matt@datto.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c
index 7db6802a55df12217663da1614f0f951847617d9..2ac30fa4c69fb989d79bfe72120e3adb7633d9cd 100644 (file)
--- a/src/hyperv/hyperv_driver.c
+++ b/src/hyperv/hyperv_driver.c
@@ -34,7 +34,6 @@
 #include "hyperv_private.h"
 #include "hyperv_util.h"
 #include "hyperv_wmi.h"
-#include "openwsman.h"
 #include "virstring.h"
 #include "virkeycode.h"
 #include "domain_conf.h"

diff --git a/src/hyperv/hyperv_private.h b/src/hyperv/hyperv_private.h
index cf08bf542bd302675db747a9209af7a097c4a30c..b31cb616af5e5557421f28509a70527d88d50ee7 100644 (file)
--- a/src/hyperv/hyperv_private.h
+++ b/src/hyperv/hyperv_private.h
@@ -22,10 +22,11 @@
 
 #pragma once
 
+#include <wsman-api.h>
+
 #include "internal.h"
 #include "virerror.h"
 #include "hyperv_util.h"
-#include "openwsman.h"
 #include "capabilities.h"
 
 typedef enum _hypervWmiVersion hypervWmiVersion;

diff --git a/src/hyperv/hyperv_wmi.c b/src/hyperv/hyperv_wmi.c
index 6d0445184aa5620f420d24c8f33df22f9e6f3c9a..2b40e720534b505e34c59122a62df407010cb044 100644 (file)
--- a/src/hyperv/hyperv_wmi.c
+++ b/src/hyperv/hyperv_wmi.c
@@ -24,7 +24,10 @@
  */
 
 #include <config.h>
+
 #include <wsman-soap.h>
+#include <wsman-xml.h>
+#include <wsman-xml-binding.h>
 
 #include "internal.h"
 #include "virerror.h"
@@ -35,7 +38,6 @@
 #include "hyperv_private.h"
 #include "hyperv_wmi.h"
 #include "virstring.h"
-#include "openwsman.h"
 #include "virlog.h"
 #include "virxml.h"
 

diff --git a/src/hyperv/hyperv_wmi.h b/src/hyperv/hyperv_wmi.h
index 8c9c5ed9c14e5c83a9c12b861e77e341c0aff774..ee16657768bd76345190c42dfe1b24a5fbb79750 100644 (file)
--- a/src/hyperv/hyperv_wmi.h
+++ b/src/hyperv/hyperv_wmi.h
@@ -26,7 +26,6 @@
 #include "virbuffer.h"
 #include "hyperv_private.h"
 #include "hyperv_wmi_classes.h"
-#include "openwsman.h"
 #include "virhash.h"
 
 

diff --git a/src/hyperv/hyperv_wmi_classes.h b/src/hyperv/hyperv_wmi_classes.h
index 7465684d6e22298d89bf1507ff9b7cf576327005..d32711589a3ef1440b5e1e5349f3ef01dc328fff 100644 (file)
--- a/src/hyperv/hyperv_wmi_classes.h
+++ b/src/hyperv/hyperv_wmi_classes.h
@@ -23,8 +23,9 @@
 
 #pragma once
 
+#include <wsman-api.h>
+
 #include "internal.h"
-#include "openwsman.h"
 
 #include "hyperv_wmi_classes.generated.typedef"
 

diff --git a/src/hyperv/openwsman.h b/src/hyperv/openwsman.h
deleted file mode 100644 (file)
index c59c450..0000000
--- a/src/hyperv/openwsman.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * openwsman.h: workarounds for bugs in openwsman
- *
- * Copyright (C) 2011 Matthias Bolte <matthias.bolte@googlemail.com>
- *
- * 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/>.
- *
- */
-
-#pragma once
-
-#include <wsman-api.h>
-
-/* wsman-xml.h */
-WsXmlDocH ws_xml_create_doc(const char *rootNsUri, const char *rootName);
-
-/* wsman-xml-binding.h */
-WsXmlNodeH xml_parser_get_root(WsXmlDocH doc);