hyperv: move hypervGetProcSDByVSSDInstanceId to hyperv_wmi.c

This places it next to existing related functions.

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

diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c
index de38dce9dbee60e72dedb517a93ba09aaae601b4..be87871085049810ad5f7142d837956e7c47e935 100644 (file)
--- a/src/hyperv/hyperv_driver.c
+++ b/src/hyperv/hyperv_driver.c
@@ -182,32 +182,6 @@ hypervGetVirtualSystemByName(hypervPrivate *priv, const char *name,
 }
 
 
-
-static int
-hypervGetProcSDByVSSDInstanceId(hypervPrivate *priv, const char *id,
-                                Msvm_ProcessorSettingData **data)
-{
-    g_auto(virBuffer) query = VIR_BUFFER_INITIALIZER;
-    virBufferEscapeSQL(&query,
-                       "ASSOCIATORS OF {Msvm_VirtualSystemSettingData.InstanceID='%s'} "
-                       "WHERE AssocClass = Msvm_VirtualSystemSettingDataComponent "
-                       "ResultClass = Msvm_ProcessorSettingData",
-                       id);
-
-    if (hypervGetWmiClass(Msvm_ProcessorSettingData, data) < 0)
-        return -1;
-
-    if (!*data) {
-        virReportError(VIR_ERR_INTERNAL_ERROR,
-                       _("Could not look up processor setting data with virtual system instance ID '%s'"),
-                       id);
-        return -1;
-    }
-
-    return 0;
-}
-
-
 static int
 hypervRequestStateChange(virDomainPtr domain, int state)
 {

diff --git a/src/hyperv/hyperv_wmi.c b/src/hyperv/hyperv_wmi.c
index 8e5d99ad7028f97bf83dda39b9d468e87fb0c428..ebdb4c79fc33f7fef5bca2142234a854374f4c64 100644 (file)
--- a/src/hyperv/hyperv_wmi.c
+++ b/src/hyperv/hyperv_wmi.c
@@ -1570,6 +1570,32 @@ hypervGetMsvmVirtualSystemSettingDataFromUUID(hypervPrivate *priv,
 }
 
 
+int
+hypervGetProcSDByVSSDInstanceId(hypervPrivate *priv,
+                                const char *id,
+                                Msvm_ProcessorSettingData **data)
+{
+    g_auto(virBuffer) query = VIR_BUFFER_INITIALIZER;
+    virBufferEscapeSQL(&query,
+                       "ASSOCIATORS OF {Msvm_VirtualSystemSettingData.InstanceID='%s'} "
+                       "WHERE AssocClass = Msvm_VirtualSystemSettingDataComponent "
+                       "ResultClass = Msvm_ProcessorSettingData",
+                       id);
+
+    if (hypervGetWmiClass(Msvm_ProcessorSettingData, data) < 0)
+        return -1;
+
+    if (!*data) {
+        virReportError(VIR_ERR_INTERNAL_ERROR,
+                       _("Could not look up processor setting data with virtual system instance ID '%s'"),
+                       id);
+        return -1;
+    }
+
+    return 0;
+}
+
+
 int
 hypervGetMsvmMemorySettingDataFromVSSD(hypervPrivate *priv,
                                        const char *vssd_instanceid,

diff --git a/src/hyperv/hyperv_wmi.h b/src/hyperv/hyperv_wmi.h
index 72c8e546780d5c40c7cf00449f21a9052e1bbed9..c06453c1fde02de5b798e7d0764dc775b4e7fa9f 100644 (file)
--- a/src/hyperv/hyperv_wmi.h
+++ b/src/hyperv/hyperv_wmi.h
@@ -250,6 +250,10 @@ int hypervGetMsvmVirtualSystemSettingDataFromUUID(hypervPrivate *priv,
                                                   const char *uuid_string,
                                                   Msvm_VirtualSystemSettingData **list);
 
+int hypervGetProcSDByVSSDInstanceId(hypervPrivate *priv,
+                                    const char *id,
+                                    Msvm_ProcessorSettingData **data);
+
 int hypervGetMsvmMemorySettingDataFromVSSD(hypervPrivate *priv,
                                            const char *vssd_instanceid,
                                            Msvm_MemorySettingData **list);