[PATCH v2 0/2] hyperv: trivial cleanups
Just a couple very minor cleanups in the hyperv driver Jonathon Jongsma (2): hyperv: use constants for xml namespaces hyperv: Remove unnecessary hash table size query. src/hyperv/hyperv_wmi.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) -- 2.53.0
Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com> --- src/hyperv/hyperv_wmi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/hyperv/hyperv_wmi.c b/src/hyperv/hyperv_wmi.c index dab7abe8cf..14df670fa1 100644 --- a/src/hyperv/hyperv_wmi.c +++ b/src/hyperv/hyperv_wmi.c @@ -513,13 +513,13 @@ hypervSerializeEprParam(hypervParam *p, hypervPrivate *priv, return -1; } - if (!ws_xml_ns_add(xmlNodeParam, "http://schemas.xmlsoap.org/ws/2004/08/addressing", "a")) { + if (!ws_xml_ns_add(xmlNodeParam, XML_NS_ADDRESSING, "a")) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not set namespace address for xmlNodeParam")); return -1; } - if (!ws_xml_ns_add(xmlNodeParam, "http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd", "w")) { + if (!ws_xml_ns_add(xmlNodeParam, XML_NS_WS_MAN, "w")) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not set wsman namespace address for xmlNodeParam")); return -1; -- 2.53.0
On Fri, Mar 20, 2026 at 16:19:22 -0500, Jonathon Jongsma via Devel wrote:
Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>
These come from openwsman's 'wsman-names.h' header.
--- src/hyperv/hyperv_wmi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com> --- src/hyperv/hyperv_wmi.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/hyperv/hyperv_wmi.c b/src/hyperv/hyperv_wmi.c index 14df670fa1..3e161429d5 100644 --- a/src/hyperv/hyperv_wmi.c +++ b/src/hyperv/hyperv_wmi.c @@ -548,7 +548,7 @@ hypervSerializeEmbeddedParam(hypervParam *p, const char *resourceUri, hypervWmiClassInfo *classInfo = p->embedded.info; g_autofree virHashKeyValuePair *items = NULL; hypervCimType *property = NULL; - ssize_t numKeys = -1; + size_t numKeys = 0; int len = 0, i = 0; if (!(xmlNodeParam = ws_xml_add_child(*methodNode, resourceUri, p->embedded.name, @@ -582,8 +582,7 @@ hypervSerializeEmbeddedParam(hypervParam *p, const char *resourceUri, } /* retrieve parameters out of hash table */ - numKeys = virHashSize(p->embedded.table); - items = virHashGetItems(p->embedded.table, NULL, false); + items = virHashGetItems(p->embedded.table, &numKeys, false); if (!items) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not read embedded param hash table")); -- 2.53.0
On Fri, Mar 20, 2026 at 16:19:23 -0500, Jonathon Jongsma via Devel wrote:
Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com> --- src/hyperv/hyperv_wmi.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/hyperv/hyperv_wmi.c b/src/hyperv/hyperv_wmi.c index 14df670fa1..3e161429d5 100644 --- a/src/hyperv/hyperv_wmi.c +++ b/src/hyperv/hyperv_wmi.c @@ -548,7 +548,7 @@ hypervSerializeEmbeddedParam(hypervParam *p, const char *resourceUri, hypervWmiClassInfo *classInfo = p->embedded.info; g_autofree virHashKeyValuePair *items = NULL; hypervCimType *property = NULL; - ssize_t numKeys = -1; + size_t numKeys = 0; int len = 0, i = 0;
if (!(xmlNodeParam = ws_xml_add_child(*methodNode, resourceUri, p->embedded.name, @@ -582,8 +582,7 @@ hypervSerializeEmbeddedParam(hypervParam *p, const char *resourceUri, }
/* retrieve parameters out of hash table */ - numKeys = virHashSize(p->embedded.table); - items = virHashGetItems(p->embedded.table, NULL, false); + items = virHashGetItems(p->embedded.table, &numKeys, false);
Since the array of items returned from virHashGetItems is NULL terminated you can also use a NULL '.key' member in the condition instead of the number.
if (!items) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not read embedded param hash table"));
Regardless of the above: Reviewed-by: Peter Krempa <pkrempa@redhat.com>
participants (2)
-
Jonathon Jongsma -
Peter Krempa