[PATCH 03/32] hyperv: use g_auto() for all virBuffers

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 

Signed-off-by: Laine Stump <laine@xxxxxxxxxx>
---
 src/hyperv/hyperv_driver.c | 34 ++++++++++++++++------------------
 src/hyperv/hyperv_wmi.c    | 11 +++++------
 2 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c
index 4677a25ff8..20d372b274 100644
--- a/src/hyperv/hyperv_driver.c
+++ b/src/hyperv/hyperv_driver.c
@@ -60,7 +60,7 @@ static int
 hypervInitConnection(virConnectPtr conn, hypervPrivate *priv,
                      char *username, char *password)
 {
-    virBuffer query = VIR_BUFFER_INITIALIZER;
+    g_auto(virBuffer) query = VIR_BUFFER_INITIALIZER;
     hypervWqlQuery wqlQuery = HYPERV_WQL_QUERY_INITIALIZER;
     hypervObject *computerSystem = NULL;
     int ret = -1;
@@ -204,7 +204,7 @@ hypervConnectGetHostname(virConnectPtr conn)
 {
     char *hostname = NULL;
     hypervPrivate *priv = conn->privateData;
-    virBuffer query = VIR_BUFFER_INITIALIZER;
+    g_auto(virBuffer) query = VIR_BUFFER_INITIALIZER;
     Win32_ComputerSystem *computerSystem = NULL;
 
     virBufferAddLit(&query, WIN32_COMPUTERSYSTEM_WQL_SELECT);
@@ -234,7 +234,7 @@ hypervNodeGetInfo(virConnectPtr conn, virNodeInfoPtr info)
 {
     int result = -1;
     hypervPrivate *priv = conn->privateData;
-    virBuffer query = VIR_BUFFER_INITIALIZER;
+    g_auto(virBuffer) query = VIR_BUFFER_INITIALIZER;
     Win32_ComputerSystem *computerSystem = NULL;
     Win32_Processor *processorList = NULL;
     Win32_Processor *processor = NULL;
@@ -329,7 +329,7 @@ hypervConnectListDomains(virConnectPtr conn, int *ids, int maxids)
 {
     bool success = false;
     hypervPrivate *priv = conn->privateData;
-    virBuffer query = VIR_BUFFER_INITIALIZER;
+    g_auto(virBuffer) query = VIR_BUFFER_INITIALIZER;
     Msvm_ComputerSystem *computerSystemList = NULL;
     Msvm_ComputerSystem *computerSystem = NULL;
     int count = 0;
@@ -371,7 +371,7 @@ hypervConnectNumOfDomains(virConnectPtr conn)
 {
     bool success = false;
     hypervPrivate *priv = conn->privateData;
-    virBuffer query = VIR_BUFFER_INITIALIZER;
+    g_auto(virBuffer) query = VIR_BUFFER_INITIALIZER;
     Msvm_ComputerSystem *computerSystemList = NULL;
     Msvm_ComputerSystem *computerSystem = NULL;
     int count = 0;
@@ -407,7 +407,7 @@ hypervDomainLookupByID(virConnectPtr conn, int id)
 {
     virDomainPtr domain = NULL;
     hypervPrivate *priv = conn->privateData;
-    virBuffer query = VIR_BUFFER_INITIALIZER;
+    g_auto(virBuffer) query = VIR_BUFFER_INITIALIZER;
     Msvm_ComputerSystem *computerSystem = NULL;
 
     virBufferAddLit(&query, MSVM_COMPUTERSYSTEM_WQL_SELECT);
@@ -439,7 +439,7 @@ hypervDomainLookupByUUID(virConnectPtr conn, const unsigned char *uuid)
     virDomainPtr domain = NULL;
     hypervPrivate *priv = conn->privateData;
     char uuid_string[VIR_UUID_STRING_BUFLEN];
-    virBuffer query = VIR_BUFFER_INITIALIZER;
+    g_auto(virBuffer) query = VIR_BUFFER_INITIALIZER;
     Msvm_ComputerSystem *computerSystem = NULL;
 
     virUUIDFormat(uuid, uuid_string);
@@ -473,7 +473,7 @@ hypervDomainLookupByName(virConnectPtr conn, const char *name)
 {
     virDomainPtr domain = NULL;
     hypervPrivate *priv = conn->privateData;
-    virBuffer query = VIR_BUFFER_INITIALIZER;
+    g_auto(virBuffer) query = VIR_BUFFER_INITIALIZER;
     Msvm_ComputerSystem *computerSystem = NULL;
 
     virBufferAddLit(&query, MSVM_COMPUTERSYSTEM_WQL_SELECT);
@@ -612,7 +612,7 @@ hypervDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info)
     int result = -1;
     hypervPrivate *priv = domain->conn->privateData;
     char uuid_string[VIR_UUID_STRING_BUFLEN];
-    virBuffer query = VIR_BUFFER_INITIALIZER;
+    g_auto(virBuffer) query = VIR_BUFFER_INITIALIZER;
     Msvm_ComputerSystem *computerSystem = NULL;
     Msvm_VirtualSystemSettingData *virtualSystemSettingData = NULL;
     Msvm_ProcessorSettingData *processorSettingData = NULL;
@@ -746,7 +746,7 @@ hypervDomainGetXMLDesc(virDomainPtr domain, unsigned int flags)
     hypervPrivate *priv = domain->conn->privateData;
     virDomainDefPtr def = NULL;
     char uuid_string[VIR_UUID_STRING_BUFLEN];
-    virBuffer query = VIR_BUFFER_INITIALIZER;
+    g_auto(virBuffer) query = VIR_BUFFER_INITIALIZER;
     Msvm_ComputerSystem *computerSystem = NULL;
     Msvm_VirtualSystemSettingData *virtualSystemSettingData = NULL;
     Msvm_ProcessorSettingData *processorSettingData = NULL;
@@ -851,7 +851,7 @@ hypervDomainGetXMLDesc(virDomainPtr domain, unsigned int flags)
     } else if (priv->wmiVersion == HYPERV_WMI_VERSION_V2 &&
                virtualSystemSettingData->data.v2->Notes.data != NULL) {
         char **notes = (char **)virtualSystemSettingData->data.v2->Notes.data;
-        virBuffer buf = VIR_BUFFER_INITIALIZER;
+        g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
         size_t i = 0;
 
         /* in practice Notes has 1 element */
@@ -906,7 +906,7 @@ hypervConnectListDefinedDomains(virConnectPtr conn, char **const names, int maxn
 {
     bool success = false;
     hypervPrivate *priv = conn->privateData;
-    virBuffer query = VIR_BUFFER_INITIALIZER;
+    g_auto(virBuffer) query = VIR_BUFFER_INITIALIZER;
     Msvm_ComputerSystem *computerSystemList = NULL;
     Msvm_ComputerSystem *computerSystem = NULL;
     int count = 0;
@@ -958,7 +958,7 @@ hypervConnectNumOfDefinedDomains(virConnectPtr conn)
 {
     bool success = false;
     hypervPrivate *priv = conn->privateData;
-    virBuffer query = VIR_BUFFER_INITIALIZER;
+    g_auto(virBuffer) query = VIR_BUFFER_INITIALIZER;
     Msvm_ComputerSystem *computerSystemList = NULL;
     Msvm_ComputerSystem *computerSystem = NULL;
     int count = 0;
@@ -1198,7 +1198,7 @@ hypervConnectListAllDomains(virConnectPtr conn,
                             unsigned int flags)
 {
     hypervPrivate *priv = conn->privateData;
-    virBuffer query = VIR_BUFFER_INITIALIZER;
+    g_auto(virBuffer) query = VIR_BUFFER_INITIALIZER;
     Msvm_ComputerSystem *computerSystemList = NULL;
     Msvm_ComputerSystem *computerSystem = NULL;
     size_t ndoms;
@@ -1336,7 +1336,7 @@ hypervDomainSendKey(virDomainPtr domain, unsigned int codeset,
     char *selector = NULL;
     Msvm_ComputerSystem *computerSystem = NULL;
     Msvm_Keyboard *keyboard = NULL;
-    virBuffer query = VIR_BUFFER_INITIALIZER;
+    g_auto(virBuffer) query = VIR_BUFFER_INITIALIZER;
     hypervInvokeParamsListPtr params = NULL;
     char keycodeStr[VIR_INT64_STR_BUFLEN];
 
@@ -1437,7 +1437,6 @@ hypervDomainSendKey(virDomainPtr domain, unsigned int codeset,
     VIR_FREE(selector);
     hypervFreeObject(priv, (hypervObject *)keyboard);
     hypervFreeObject(priv, (hypervObject *)computerSystem);
-    virBufferFreeAndReset(&query);
     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);
     Msvm_VirtualSystemSettingData *vssd = NULL;
     Msvm_MemorySettingData *memsd = NULL;
-    virBuffer eprQuery = VIR_BUFFER_INITIALIZER;
+    g_auto(virBuffer) eprQuery = VIR_BUFFER_INITIALIZER;
     virHashTablePtr memResource = NULL;
 
     virCheckFlags(0, -1);
@@ -1537,7 +1536,6 @@ hypervDomainSetMemoryFlags(virDomainPtr domain, unsigned long memory,
 
  params_cleanup:
     hypervFreeInvokeParams(params);
-    virBufferFreeAndReset(&eprQuery);
  cleanup:
     VIR_FREE(memory_str);
     hypervFreeObject(priv, (hypervObject *)vssd);
diff --git a/src/hyperv/hyperv_wmi.c b/src/hyperv/hyperv_wmi.c
index ca2d29733e..f8d0aaf373 100644
--- a/src/hyperv/hyperv_wmi.c
+++ b/src/hyperv/hyperv_wmi.c
@@ -778,7 +778,7 @@ hypervInvokeMethod(hypervPrivate *priv, hypervInvokeParamsListPtr params,
     char *returnValue = NULL;
     char *instanceID = NULL;
     bool completed = false;
-    virBuffer query = VIR_BUFFER_INITIALIZER;
+    g_auto(virBuffer) query = VIR_BUFFER_INITIALIZER;
     Msvm_ConcreteJob *job = NULL;
     int jobState = -1;
     hypervParamPtr p = NULL;
@@ -939,7 +939,6 @@ hypervInvokeMethod(hypervPrivate *priv, hypervInvokeParamsListPtr params,
     VIR_FREE(jobcode_instance_xpath);
     VIR_FREE(returnValue);
     VIR_FREE(instanceID);
-    virBufferFreeAndReset(&query);
     hypervFreeObject(priv, (hypervObject *)job);
     hypervFreeInvokeParams(params);
     return result;
@@ -1314,7 +1313,7 @@ hypervInvokeMsvmComputerSystemRequestStateChange(virDomainPtr domain,
     char *returnValue = NULL;
     int returnCode;
     char *instanceID = NULL;
-    virBuffer query = VIR_BUFFER_INITIALIZER;
+    g_auto(virBuffer) query = VIR_BUFFER_INITIALIZER;
     Msvm_ConcreteJob *concreteJob = NULL;
     bool completed = false;
     const char *resourceUri = MSVM_COMPUTERSYSTEM_V2_RESOURCE_URI;
@@ -1553,7 +1552,7 @@ hypervMsvmComputerSystemFromDomain(virDomainPtr domain,
 {
     hypervPrivate *priv = domain->conn->privateData;
     char uuid_string[VIR_UUID_STRING_BUFLEN];
-    virBuffer query = VIR_BUFFER_INITIALIZER;
+    g_auto(virBuffer) query = VIR_BUFFER_INITIALIZER;
 
     if (computerSystem == NULL || *computerSystem != NULL) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument"));
@@ -1588,7 +1587,7 @@ int
 hypervGetMsvmVirtualSystemSettingDataFromUUID(hypervPrivate *priv,
         const char *uuid_string, Msvm_VirtualSystemSettingData **list)
 {
-    virBuffer query = VIR_BUFFER_INITIALIZER;
+    g_auto(virBuffer) query = VIR_BUFFER_INITIALIZER;
 
     virBufferAsprintf(&query,
             "associators of "
@@ -1614,7 +1613,7 @@ int
 hypervGetMsvmMemorySettingDataFromVSSD(hypervPrivate *priv,
         const char *vssd_instanceid, Msvm_MemorySettingData **list)
 {
-    virBuffer query = VIR_BUFFER_INITIALIZER;
+    g_auto(virBuffer) query = VIR_BUFFER_INITIALIZER;
 
     virBufferAsprintf(&query,
             "associators of "
-- 
2.25.4
[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]

  Powered by Linux