External/libvirt
1
0
Fork 0
Code

hyperv: use g_auto() for all virBuffers

Browse Source 
Signed-off-by: Laine Stump <laine@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Laine Stump 2020-07-02 18:16:08 -04:00
parent 2ab37b6b90
commit fc81c07427
2 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/hyperv/hyperv_driver.c
View File

@ -60,7 +60,7 @@ static int
hypervInitConnection(virConnectPtr conn, hypervPrivate *priv, hypervInitConnection(virConnectPtr conn, hypervPrivate *priv,
char *username, char *password) char *username, char *password)
{ {
virBuffer query = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) query = VIR_BUFFER_INITIALIZER;
hypervWqlQuery wqlQuery = HYPERV_WQL_QUERY_INITIALIZER; hypervWqlQuery wqlQuery = HYPERV_WQL_QUERY_INITIALIZER;
hypervObject *computerSystem = NULL; hypervObject *computerSystem = NULL;
int ret = -1; int ret = -1;
@ -204,7 +204,7 @@ hypervConnectGetHostname(virConnectPtr conn)
{ {
char *hostname = NULL; char *hostname = NULL;
hypervPrivate *priv = conn->privateData; hypervPrivate *priv = conn->privateData;
virBuffer query = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) query = VIR_BUFFER_INITIALIZER;
Win32_ComputerSystem *computerSystem = NULL; Win32_ComputerSystem *computerSystem = NULL;
virBufferAddLit(&query, WIN32_COMPUTERSYSTEM_WQL_SELECT); virBufferAddLit(&query, WIN32_COMPUTERSYSTEM_WQL_SELECT);
@ -234,7 +234,7 @@ hypervNodeGetInfo(virConnectPtr conn, virNodeInfoPtr info)
{ {
int result = -1; int result = -1;
hypervPrivate *priv = conn->privateData; hypervPrivate *priv = conn->privateData;
virBuffer query = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) query = VIR_BUFFER_INITIALIZER;
Win32_ComputerSystem *computerSystem = NULL; Win32_ComputerSystem *computerSystem = NULL;
Win32_Processor *processorList = NULL; Win32_Processor *processorList = NULL;
Win32_Processor *processor = NULL; Win32_Processor *processor = NULL;
@ -329,7 +329,7 @@ hypervConnectListDomains(virConnectPtr conn, int *ids, int maxids)
{ {
bool success = false; bool success = false;
hypervPrivate *priv = conn->privateData; hypervPrivate *priv = conn->privateData;
virBuffer query = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) query = VIR_BUFFER_INITIALIZER;
Msvm_ComputerSystem *computerSystemList = NULL; Msvm_ComputerSystem *computerSystemList = NULL;
Msvm_ComputerSystem *computerSystem = NULL; Msvm_ComputerSystem *computerSystem = NULL;
int count = 0; int count = 0;
@ -371,7 +371,7 @@ hypervConnectNumOfDomains(virConnectPtr conn)
{ {
bool success = false; bool success = false;
hypervPrivate *priv = conn->privateData; hypervPrivate *priv = conn->privateData;
virBuffer query = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) query = VIR_BUFFER_INITIALIZER;
Msvm_ComputerSystem *computerSystemList = NULL; Msvm_ComputerSystem *computerSystemList = NULL;
Msvm_ComputerSystem *computerSystem = NULL; Msvm_ComputerSystem *computerSystem = NULL;
int count = 0; int count = 0;
@ -407,7 +407,7 @@ hypervDomainLookupByID(virConnectPtr conn, int id)
{ {
virDomainPtr domain = NULL; virDomainPtr domain = NULL;
hypervPrivate *priv = conn->privateData; hypervPrivate *priv = conn->privateData;
virBuffer query = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) query = VIR_BUFFER_INITIALIZER;
Msvm_ComputerSystem *computerSystem = NULL; Msvm_ComputerSystem *computerSystem = NULL;
virBufferAddLit(&query, MSVM_COMPUTERSYSTEM_WQL_SELECT); virBufferAddLit(&query, MSVM_COMPUTERSYSTEM_WQL_SELECT);
@ -439,7 +439,7 @@ hypervDomainLookupByUUID(virConnectPtr conn, const unsigned char *uuid)
virDomainPtr domain = NULL; virDomainPtr domain = NULL;
hypervPrivate *priv = conn->privateData; hypervPrivate *priv = conn->privateData;
char uuid_string[VIR_UUID_STRING_BUFLEN]; char uuid_string[VIR_UUID_STRING_BUFLEN];
virBuffer query = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) query = VIR_BUFFER_INITIALIZER;
Msvm_ComputerSystem *computerSystem = NULL; Msvm_ComputerSystem *computerSystem = NULL;
virUUIDFormat(uuid, uuid_string); virUUIDFormat(uuid, uuid_string);
@ -473,7 +473,7 @@ hypervDomainLookupByName(virConnectPtr conn, const char *name)
{ {
virDomainPtr domain = NULL; virDomainPtr domain = NULL;
hypervPrivate *priv = conn->privateData; hypervPrivate *priv = conn->privateData;
virBuffer query = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) query = VIR_BUFFER_INITIALIZER;
Msvm_ComputerSystem *computerSystem = NULL; Msvm_ComputerSystem *computerSystem = NULL;
virBufferAddLit(&query, MSVM_COMPUTERSYSTEM_WQL_SELECT); virBufferAddLit(&query, MSVM_COMPUTERSYSTEM_WQL_SELECT);
@ -612,7 +612,7 @@ hypervDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info)
int result = -1; int result = -1;
hypervPrivate *priv = domain->conn->privateData; hypervPrivate *priv = domain->conn->privateData;
char uuid_string[VIR_UUID_STRING_BUFLEN]; char uuid_string[VIR_UUID_STRING_BUFLEN];
virBuffer query = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) query = VIR_BUFFER_INITIALIZER;
Msvm_ComputerSystem *computerSystem = NULL; Msvm_ComputerSystem *computerSystem = NULL;
Msvm_VirtualSystemSettingData *virtualSystemSettingData = NULL; Msvm_VirtualSystemSettingData *virtualSystemSettingData = NULL;
Msvm_ProcessorSettingData *processorSettingData = NULL; Msvm_ProcessorSettingData *processorSettingData = NULL;
@ -746,7 +746,7 @@ hypervDomainGetXMLDesc(virDomainPtr domain, unsigned int flags)
hypervPrivate *priv = domain->conn->privateData; hypervPrivate *priv = domain->conn->privateData;
virDomainDefPtr def = NULL; virDomainDefPtr def = NULL;
char uuid_string[VIR_UUID_STRING_BUFLEN]; char uuid_string[VIR_UUID_STRING_BUFLEN];
virBuffer query = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) query = VIR_BUFFER_INITIALIZER;
Msvm_ComputerSystem *computerSystem = NULL; Msvm_ComputerSystem *computerSystem = NULL;
Msvm_VirtualSystemSettingData *virtualSystemSettingData = NULL; Msvm_VirtualSystemSettingData *virtualSystemSettingData = NULL;
Msvm_ProcessorSettingData *processorSettingData = NULL; Msvm_ProcessorSettingData *processorSettingData = NULL;
@ -851,7 +851,7 @@ hypervDomainGetXMLDesc(virDomainPtr domain, unsigned int flags)
} else if (priv->wmiVersion == HYPERV_WMI_VERSION_V2 && } else if (priv->wmiVersion == HYPERV_WMI_VERSION_V2 &&
virtualSystemSettingData->data.v2->Notes.data != NULL) { virtualSystemSettingData->data.v2->Notes.data != NULL) {
char **notes = (char **)virtualSystemSettingData->data.v2->Notes.data; char **notes = (char **)virtualSystemSettingData->data.v2->Notes.data;
virBuffer buf = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
size_t i = 0; size_t i = 0;
/* in practice Notes has 1 element */ /* in practice Notes has 1 element */
@ -906,7 +906,7 @@ hypervConnectListDefinedDomains(virConnectPtr conn, char **const names, int maxn
{ {
bool success = false; bool success = false;
hypervPrivate *priv = conn->privateData; hypervPrivate *priv = conn->privateData;
virBuffer query = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) query = VIR_BUFFER_INITIALIZER;
Msvm_ComputerSystem *computerSystemList = NULL; Msvm_ComputerSystem *computerSystemList = NULL;
Msvm_ComputerSystem *computerSystem = NULL; Msvm_ComputerSystem *computerSystem = NULL;
int count = 0; int count = 0;
@ -958,7 +958,7 @@ hypervConnectNumOfDefinedDomains(virConnectPtr conn)
{ {
bool success = false; bool success = false;
hypervPrivate *priv = conn->privateData; hypervPrivate *priv = conn->privateData;
virBuffer query = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) query = VIR_BUFFER_INITIALIZER;
Msvm_ComputerSystem *computerSystemList = NULL; Msvm_ComputerSystem *computerSystemList = NULL;
Msvm_ComputerSystem *computerSystem = NULL; Msvm_ComputerSystem *computerSystem = NULL;
int count = 0; int count = 0;
@ -1198,7 +1198,7 @@ hypervConnectListAllDomains(virConnectPtr conn,
unsigned int flags) unsigned int flags)
{ {
hypervPrivate *priv = conn->privateData; hypervPrivate *priv = conn->privateData;
virBuffer query = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) query = VIR_BUFFER_INITIALIZER;
Msvm_ComputerSystem *computerSystemList = NULL; Msvm_ComputerSystem *computerSystemList = NULL;
Msvm_ComputerSystem *computerSystem = NULL; Msvm_ComputerSystem *computerSystem = NULL;
size_t ndoms; size_t ndoms;
@ -1336,7 +1336,7 @@ hypervDomainSendKey(virDomainPtr domain, unsigned int codeset,
char *selector = NULL; char *selector = NULL;
Msvm_ComputerSystem *computerSystem = NULL; Msvm_ComputerSystem *computerSystem = NULL;
Msvm_Keyboard *keyboard = NULL; Msvm_Keyboard *keyboard = NULL;
virBuffer query = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) query = VIR_BUFFER_INITIALIZER;
hypervInvokeParamsListPtr params = NULL; hypervInvokeParamsListPtr params = NULL;
char keycodeStr[VIR_INT64_STR_BUFLEN]; char keycodeStr[VIR_INT64_STR_BUFLEN];
@ -1437,7 +1437,6 @@ hypervDomainSendKey(virDomainPtr domain, unsigned int codeset,
VIR_FREE(selector); VIR_FREE(selector);
hypervFreeObject(priv, (hypervObject *)keyboard); hypervFreeObject(priv, (hypervObject *)keyboard);
hypervFreeObject(priv, (hypervObject *)computerSystem); hypervFreeObject(priv, (hypervObject *)computerSystem);
virBufferFreeAndReset(&query);
return result; return result;
} }
@ -1454,7 +1453,7 @@ hypervDomainSetMemoryFlags(virDomainPtr domain, unsigned long memory,
unsigned long memory_mb = VIR_ROUND_UP(VIR_DIV_UP(memory, 1024), 2); unsigned long memory_mb = VIR_ROUND_UP(VIR_DIV_UP(memory, 1024), 2);
Msvm_VirtualSystemSettingData *vssd = NULL; Msvm_VirtualSystemSettingData *vssd = NULL;
Msvm_MemorySettingData *memsd = NULL; Msvm_MemorySettingData *memsd = NULL;
virBuffer eprQuery = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) eprQuery = VIR_BUFFER_INITIALIZER;
virHashTablePtr memResource = NULL; virHashTablePtr memResource = NULL;
virCheckFlags(0, -1); virCheckFlags(0, -1);
@ -1537,7 +1536,6 @@ hypervDomainSetMemoryFlags(virDomainPtr domain, unsigned long memory,
params_cleanup: params_cleanup:
hypervFreeInvokeParams(params); hypervFreeInvokeParams(params);
virBufferFreeAndReset(&eprQuery);
cleanup: cleanup:
VIR_FREE(memory_str); VIR_FREE(memory_str);
hypervFreeObject(priv, (hypervObject *)vssd); hypervFreeObject(priv, (hypervObject *)vssd);

11
src/hyperv/hyperv_wmi.c
View File

@ -778,7 +778,7 @@ hypervInvokeMethod(hypervPrivate *priv, hypervInvokeParamsListPtr params,
char *returnValue = NULL; char *returnValue = NULL;
char *instanceID = NULL; char *instanceID = NULL;
bool completed = false; bool completed = false;
virBuffer query = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) query = VIR_BUFFER_INITIALIZER;
Msvm_ConcreteJob *job = NULL; Msvm_ConcreteJob *job = NULL;
int jobState = -1; int jobState = -1;
hypervParamPtr p = NULL; hypervParamPtr p = NULL;
@ -939,7 +939,6 @@ hypervInvokeMethod(hypervPrivate *priv, hypervInvokeParamsListPtr params,
VIR_FREE(jobcode_instance_xpath); VIR_FREE(jobcode_instance_xpath);
VIR_FREE(returnValue); VIR_FREE(returnValue);
VIR_FREE(instanceID); VIR_FREE(instanceID);
virBufferFreeAndReset(&query);
hypervFreeObject(priv, (hypervObject *)job); hypervFreeObject(priv, (hypervObject *)job);
hypervFreeInvokeParams(params); hypervFreeInvokeParams(params);
return result; return result;
@ -1314,7 +1313,7 @@ hypervInvokeMsvmComputerSystemRequestStateChange(virDomainPtr domain,
char *returnValue = NULL; char *returnValue = NULL;
int returnCode; int returnCode;
char *instanceID = NULL; char *instanceID = NULL;
virBuffer query = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) query = VIR_BUFFER_INITIALIZER;
Msvm_ConcreteJob *concreteJob = NULL; Msvm_ConcreteJob *concreteJob = NULL;
bool completed = false; bool completed = false;
const char *resourceUri = MSVM_COMPUTERSYSTEM_V2_RESOURCE_URI; const char *resourceUri = MSVM_COMPUTERSYSTEM_V2_RESOURCE_URI;
@ -1553,7 +1552,7 @@ hypervMsvmComputerSystemFromDomain(virDomainPtr domain,
{ {
hypervPrivate *priv = domain->conn->privateData; hypervPrivate *priv = domain->conn->privateData;
char uuid_string[VIR_UUID_STRING_BUFLEN]; char uuid_string[VIR_UUID_STRING_BUFLEN];
virBuffer query = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) query = VIR_BUFFER_INITIALIZER;
if (computerSystem == NULL || *computerSystem != NULL) { if (computerSystem == NULL || *computerSystem != NULL) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument"));
@ -1588,7 +1587,7 @@ int
hypervGetMsvmVirtualSystemSettingDataFromUUID(hypervPrivate *priv, hypervGetMsvmVirtualSystemSettingDataFromUUID(hypervPrivate *priv,
const char *uuid_string, Msvm_VirtualSystemSettingData **list) const char *uuid_string, Msvm_VirtualSystemSettingData **list)
{ {
virBuffer query = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) query = VIR_BUFFER_INITIALIZER;
virBufferAsprintf(&query, virBufferAsprintf(&query,
"associators of " "associators of "
@ -1614,7 +1613,7 @@ int
hypervGetMsvmMemorySettingDataFromVSSD(hypervPrivate *priv, hypervGetMsvmMemorySettingDataFromVSSD(hypervPrivate *priv,
const char *vssd_instanceid, Msvm_MemorySettingData **list) const char *vssd_instanceid, Msvm_MemorySettingData **list)
{ {
virBuffer query = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) query = VIR_BUFFER_INITIALIZER;
virBufferAsprintf(&query, virBufferAsprintf(&query,
"associators of " "associators of "