Signed-off-by: Matt Coleman <m...@datto.com>
---
src/hyperv/hyperv_driver.c | 27 +++++++++++++--------------
src/hyperv/hyperv_wmi.c | 12 ++++++------
src/hyperv/hyperv_wmi.h | 12 ++++++------
3 files changed, 25 insertions(+), 26 deletions(-)
diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c
index be87871085..007210f824 100644
--- a/src/hyperv/hyperv_driver.c
+++ b/src/hyperv/hyperv_driver.c
@@ -985,14 +985,14 @@ hypervDomainGetInfo(virDomainPtr domain, virDomainInfoPtr
info)
&virtualSystemSettingData) < 0)
goto cleanup;
- if (hypervGetProcSDByVSSDInstanceId(priv,
-
virtualSystemSettingData->data.common->InstanceID,
- &processorSettingData) < 0)
+ if (hypervGetProcessorSD(priv,
+ virtualSystemSettingData->data.common->InstanceID,
+ &processorSettingData) < 0)
goto cleanup;
- if (hypervGetMsvmMemorySettingDataFromVSSD(priv,
-
virtualSystemSettingData->data.common->InstanceID,
- &memorySettingData) < 0)
+ if (hypervGetMemorySD(priv,
+ virtualSystemSettingData->data.common->InstanceID,
+ &memorySettingData) < 0)
goto cleanup;
/* Fill struct */
@@ -1068,14 +1068,14 @@ hypervDomainGetXMLDesc(virDomainPtr domain, unsigned
int flags)
&virtualSystemSettingData) < 0)
goto cleanup;
- if (hypervGetProcSDByVSSDInstanceId(priv,
-
virtualSystemSettingData->data.common->InstanceID,
- &processorSettingData) < 0)
+ if (hypervGetProcessorSD(priv,
+ virtualSystemSettingData->data.common->InstanceID,
+ &processorSettingData) < 0)
goto cleanup;
- if (hypervGetMsvmMemorySettingDataFromVSSD(priv,
-
virtualSystemSettingData->data.common->InstanceID,
- &memorySettingData) < 0)
+ if (hypervGetMemorySD(priv,
+ virtualSystemSettingData->data.common->InstanceID,
+ &memorySettingData) < 0)
goto cleanup;
/* Fill struct */
@@ -1817,8 +1817,7 @@ hypervDomainSetMemoryFlags(virDomainPtr domain, unsigned
long memory,
if (hypervGetMsvmVirtualSystemSettingDataFromUUID(priv, uuid_string,
&vssd) < 0)
goto cleanup;
- if (hypervGetMsvmMemorySettingDataFromVSSD(priv,
vssd->data.common->InstanceID,
- &memsd) < 0)
+ if (hypervGetMemorySD(priv, vssd->data.common->InstanceID, &memsd) < 0)
goto cleanup;
if (priv->wmiVersion == HYPERV_WMI_VERSION_V1) {
diff --git a/src/hyperv/hyperv_wmi.c b/src/hyperv/hyperv_wmi.c
index ebdb4c79fc..f2c7c365fa 100644
--- a/src/hyperv/hyperv_wmi.c
+++ b/src/hyperv/hyperv_wmi.c
@@ -1571,9 +1571,9 @@
hypervGetMsvmVirtualSystemSettingDataFromUUID(hypervPrivate *priv,
int
-hypervGetProcSDByVSSDInstanceId(hypervPrivate *priv,
- const char *id,
- Msvm_ProcessorSettingData **data)
+hypervGetProcessorSD(hypervPrivate *priv,
+ const char *id,
+ Msvm_ProcessorSettingData **data)
{
g_auto(virBuffer) query = VIR_BUFFER_INITIALIZER;
virBufferEscapeSQL(&query,
@@ -1597,9 +1597,9 @@ hypervGetProcSDByVSSDInstanceId(hypervPrivate *priv,
int
-hypervGetMsvmMemorySettingDataFromVSSD(hypervPrivate *priv,
- const char *vssd_instanceid,
- Msvm_MemorySettingData **list)
+hypervGetMemorySD(hypervPrivate *priv,
+ const char *vssd_instanceid,
+ Msvm_MemorySettingData **list)
{
g_auto(virBuffer) query = VIR_BUFFER_INITIALIZER;
diff --git a/src/hyperv/hyperv_wmi.h b/src/hyperv/hyperv_wmi.h
index c06453c1fd..bf9c3b3bd3 100644
--- a/src/hyperv/hyperv_wmi.h
+++ b/src/hyperv/hyperv_wmi.h
@@ -250,10 +250,10 @@ int
hypervGetMsvmVirtualSystemSettingDataFromUUID(hypervPrivate *priv,
const char *uuid_string,
Msvm_VirtualSystemSettingData **list);
-int hypervGetProcSDByVSSDInstanceId(hypervPrivate *priv,
- const char *id,
- Msvm_ProcessorSettingData **data);
+int hypervGetProcessorSD(hypervPrivate *priv,
+ const char *id,
+ Msvm_ProcessorSettingData **data);
-int hypervGetMsvmMemorySettingDataFromVSSD(hypervPrivate *priv,
- const char *vssd_instanceid,
- Msvm_MemorySettingData **list);
+int hypervGetMemorySD(hypervPrivate *priv,
+ const char *vssd_instanceid,
+ Msvm_MemorySettingData **list);
--
2.27.0
