From 58ae6be649d636b1387d7ef8c1c1f0c1c803c40f Mon Sep 17 00:00:00 2001 From: Matt Coleman Date: Mon, 2 Nov 2020 19:22:03 -0500 Subject: [PATCH] hyperv: WMI class list function general cleanup * use the same section comment in the header and code * place the items in the same relative location within the .h and .c * one parameter per line for multiline function definitions Signed-off-by: Matt Coleman Reviewed-by: Neal Gompa Reviewed-by: Michal Privoznik --- src/hyperv/hyperv_wmi.c | 12 +++++------- src/hyperv/hyperv_wmi.h | 24 ++++++++++++------------ 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/src/hyperv/hyperv_wmi.c b/src/hyperv/hyperv_wmi.c index 66aed01832..42ab00e629 100644 --- a/src/hyperv/hyperv_wmi.c +++ b/src/hyperv/hyperv_wmi.c @@ -1550,12 +1550,13 @@ hypervMsvmComputerSystemFromDomain(virDomainPtr domain, /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Msvm_VirtualSystemSettingData + * Generic "Get WMI class list" helpers */ int hypervGetMsvmVirtualSystemSettingDataFromUUID(hypervPrivate *priv, - const char *uuid_string, Msvm_VirtualSystemSettingData **list) + const char *uuid_string, + Msvm_VirtualSystemSettingData **list) { g_auto(virBuffer) query = VIR_BUFFER_INITIALIZER; @@ -1573,13 +1574,10 @@ hypervGetMsvmVirtualSystemSettingDataFromUUID(hypervPrivate *priv, } -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Msvm_MemorySettingData - */ - int hypervGetMsvmMemorySettingDataFromVSSD(hypervPrivate *priv, - const char *vssd_instanceid, Msvm_MemorySettingData **list) + 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 5b97ab3db9..c8bb82ca6b 100644 --- a/src/hyperv/hyperv_wmi.h +++ b/src/hyperv/hyperv_wmi.h @@ -201,22 +201,10 @@ const char *hypervReturnCodeToString(int returnCode); -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Generic "Get WMI class list" helpers - */ - int hypervGetWmiClassList(hypervPrivate *priv, hypervWmiClassInfoListPtr wmiInfo, virBufferPtr query, hypervObject **wmiClass); -int hypervGetMsvmVirtualSystemSettingDataFromUUID(hypervPrivate *priv, - const char *uuid_string, - Msvm_VirtualSystemSettingData **list); - -int hypervGetMsvmMemorySettingDataFromVSSD(hypervPrivate *priv, - const char *vssd_instanceid, - Msvm_MemorySettingData **list); - /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * Msvm_ComputerSystem */ @@ -239,3 +227,15 @@ hypervMsvmComputerSystemFromUUID(hypervPrivate *priv, const char *uuid, int hypervMsvmComputerSystemFromDomain(virDomainPtr domain, Msvm_ComputerSystem **computerSystem); + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * Generic "Get WMI class list" helpers + */ + +int hypervGetMsvmVirtualSystemSettingDataFromUUID(hypervPrivate *priv, + const char *uuid_string, + Msvm_VirtualSystemSettingData **list); + +int hypervGetMsvmMemorySettingDataFromVSSD(hypervPrivate *priv, + const char *vssd_instanceid, + Msvm_MemorySettingData **list);