libxl: use g_auto() for all virBuffers

Signed-off-by: Laine Stump <laine@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c
index a0059fc2a7e266ef84ab64599f7475dab72dfa25..124e08d598707c1bd76a33583346de362b2b9ed8 100644 (file)
--- a/src/libxl/libxl_conf.c
+++ b/src/libxl/libxl_conf.c
@@ -911,7 +911,7 @@ libxlMakeNetworkDiskSrcStr(virStorageSourcePtr src,
                            const char *secret)
 {
     char *ret = NULL;
-    virBuffer buf = VIR_BUFFER_INITIALIZER;
+    g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
     size_t i;
 
     switch ((virStorageNetProtocol) src->protocol) {
@@ -978,7 +978,6 @@ libxlMakeNetworkDiskSrcStr(virStorageSourcePtr src,
     }
 
  cleanup:
-    virBufferFreeAndReset(&buf);
     return ret;
 }
 
@@ -1241,7 +1240,7 @@ libxlMakeNic(virDomainDefPtr def,
     const virNetDevBandwidth *actual_bw;
     const virNetDevVPortProfile *port_profile;
     const virNetDevVlan *virt_vlan;
-    virBuffer buf = VIR_BUFFER_INITIALIZER;
+    g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
     size_t i;
     const char *script = NULL;
     int ret = -1;
@@ -1434,7 +1433,6 @@ libxlMakeNic(virDomainDefPtr def,
     ret = 0;
 
  cleanup:
-    virBufferFreeAndReset(&buf);
     virObjectUnref(network);
     virObjectUnref(conn);
 

diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index a80bc3fe3a9d570d1b9157511a77e798cb847713..9b9713df2c641c24e38d92f3bd87132d234a6991 100644 (file)
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -942,7 +942,7 @@ static char *
 libxlConnectGetSysinfo(virConnectPtr conn, unsigned int flags)
 {
     libxlDriverPrivatePtr driver = conn->privateData;
-    virBuffer buf = VIR_BUFFER_INITIALIZER;
+    g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
 
     virCheckFlags(0, NULL);
 

diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c
index 9d253346ebfd98f13453f108fe5a13b713684e82..87cd5337baf798f54b28b16fad0d38447bcedd95 100644 (file)
--- a/src/libxl/libxl_migration.c
+++ b/src/libxl/libxl_migration.c
@@ -117,7 +117,7 @@ libxlMigrationBakeCookie(libxlMigrationCookiePtr mig,
                          char **cookieout,
                          int *cookieoutlen)
 {
-    virBuffer buf = VIR_BUFFER_INITIALIZER;
+    g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
     char uuidstr[VIR_UUID_STRING_BUFLEN];
 
     if (!cookieout || !cookieoutlen)

diff --git a/src/libxl/xen_common.c b/src/libxl/xen_common.c
index 5c37e431ebd50f54e809abbe2b0bfb9fe26643dc..6b16752c8afc640349dffd12d1eb4db8ea0bed4d 100644 (file)
--- a/src/libxl/xen_common.c
+++ b/src/libxl/xen_common.c
@@ -1633,7 +1633,7 @@ xenFormatSxprChr(virDomainChrDefPtr def,
 static int
 xenFormatSerial(virConfValuePtr list, virDomainChrDefPtr serial)
 {
-    virBuffer buf = VIR_BUFFER_INITIALIZER;
+    g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
     virConfValuePtr val, tmp;
     int ret;
 
@@ -1661,7 +1661,6 @@ xenFormatSerial(virConfValuePtr list, virDomainChrDefPtr serial)
     return 0;
 
  cleanup:
-    virBufferFreeAndReset(&buf);
     return -1;
 }
 
@@ -1694,7 +1693,7 @@ xenFormatNet(virConnectPtr conn,
              int hvm,
              const char *vif_typename)
 {
-    virBuffer buf = VIR_BUFFER_INITIALIZER;
+    g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
     virConfValuePtr val, tmp;
     char macaddr[VIR_MAC_STRING_BUFLEN];
 
@@ -1826,7 +1825,6 @@ xenFormatNet(virConnectPtr conn,
     return 0;
 
  cleanup:
-    virBufferFreeAndReset(&buf);
     return -1;
 }
 
@@ -2034,7 +2032,7 @@ xenFormatCharDev(virConfPtr conf, virDomainDefPtr def,
 
     if (def->os.type == VIR_DOMAIN_OSTYPE_HVM) {
         if (def->nparallels) {
-            virBuffer buf = VIR_BUFFER_INITIALIZER;
+            g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
             char *str;
             int ret;
 
@@ -2052,7 +2050,7 @@ xenFormatCharDev(virConfPtr conf, virDomainDefPtr def,
 
         if (def->nserials) {
             if ((def->nserials == 1) && (def->serials[0]->target.port == 0)) {
-                virBuffer buf = VIR_BUFFER_INITIALIZER;
+                g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
                 char *str;
                 int ret;
 
@@ -2329,7 +2327,7 @@ xenFormatVfb(virConfPtr conf, virDomainDefPtr def)
         } else {
             virConfValuePtr vfb, disp;
             char *vfbstr = NULL;
-            virBuffer buf = VIR_BUFFER_INITIALIZER;
+            g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
 
             if (def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_SDL) {
                 virBufferAddLit(&buf, "type=sdl");

diff --git a/src/libxl/xen_xl.c b/src/libxl/xen_xl.c
index b99ddd150be9f1a5b105ba6b4109b67518b3c2d1..f4d6a631d11ce777534c226f59de8c051c4c98a2 100644 (file)
--- a/src/libxl/xen_xl.c
+++ b/src/libxl/xen_xl.c
@@ -1444,7 +1444,7 @@ xenFormatXLVnuma(virConfValuePtr list,
 {
     int ret = -1;
     size_t i;
-    virBuffer buf = VIR_BUFFER_INITIALIZER;
+    g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
     virConfValuePtr numaVnode, tmp;
     virBitmapPtr cpumask = virDomainNumaGetNodeCpumask(numa, node);
     size_t nodeSize = virDomainNumaGetNodeMemorySize(numa, node) / 1024;
@@ -1565,7 +1565,7 @@ static char *
 xenFormatXLDiskSrcNet(virStorageSourcePtr src)
 {
     char *ret = NULL;
-    virBuffer buf = VIR_BUFFER_INITIALIZER;
+    g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
     size_t i;
 
     switch ((virStorageNetProtocol) src->protocol) {
@@ -1622,8 +1622,6 @@ xenFormatXLDiskSrcNet(virStorageSourcePtr src)
     }
 
  cleanup:
-    virBufferFreeAndReset(&buf);
-
     return ret;
 }
 
@@ -1664,7 +1662,7 @@ xenFormatXLDiskSrc(virStorageSourcePtr src, char **srcstr)
 static int
 xenFormatXLDisk(virConfValuePtr list, virDomainDiskDefPtr disk)
 {
-    virBuffer buf = VIR_BUFFER_INITIALIZER;
+    g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
     virConfValuePtr val, tmp;
     int format = virDomainDiskGetFormat(disk);
     const char *driver = virDomainDiskGetDriver(disk);
@@ -1756,7 +1754,6 @@ xenFormatXLDisk(virConfValuePtr list, virDomainDiskDefPtr disk)
 
  cleanup:
     VIR_FREE(target);
-    virBufferFreeAndReset(&buf);
     return ret;
 }
 
@@ -1978,7 +1975,7 @@ xenFormatXLUSBController(virConfPtr conf,
     for (i = 0; i < def->ncontrollers; i++) {
         if (def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_USB) {
             virConfValuePtr val, tmp;
-            virBuffer buf = VIR_BUFFER_INITIALIZER;
+            g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
 
             if (def->controllers[i]->model != -1) {
                 switch (def->controllers[i]->model) {
@@ -1999,10 +1996,9 @@ xenFormatXLUSBController(virConfPtr conf,
                 virBufferAsprintf(&buf, "ports=%x",
                                   def->controllers[i]->opts.usbopts.ports);
 
-            if (VIR_ALLOC(val) < 0) {
-                virBufferFreeAndReset(&buf);
+            if (VIR_ALLOC(val) < 0)
                 goto error;
-            }
+
             val->type = VIR_CONF_STRING;
             val->str = virBufferContentAndReset(&buf);
             tmp = usbctrlVal->list;
@@ -2100,7 +2096,7 @@ xenFormatXLUSB(virConfPtr conf,
 static int
 xenFormatXLChannel(virConfValuePtr list, virDomainChrDefPtr channel)
 {
-    virBuffer buf = VIR_BUFFER_INITIALIZER;
+    g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
     int sourceType = channel->source->type;
     virConfValuePtr val, tmp;
 
@@ -2139,7 +2135,6 @@ xenFormatXLChannel(virConfValuePtr list, virDomainChrDefPtr channel)
     return 0;
 
  cleanup:
-    virBufferFreeAndReset(&buf);
     return -1;
 }
 

diff --git a/src/libxl/xen_xm.c b/src/libxl/xen_xm.c
index 3883725efc29ab4aa0b4ea84b5fb487b6bf4ebcf..f28326ade8a04af4ba537a05c131c9edee2d868b 100644 (file)
--- a/src/libxl/xen_xm.c
+++ b/src/libxl/xen_xm.c
@@ -290,7 +290,7 @@ static int
 xenFormatXMDisk(virConfValuePtr list,
                 virDomainDiskDefPtr disk)
 {
-    virBuffer buf = VIR_BUFFER_INITIALIZER;
+    g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
     virConfValuePtr val, tmp;
     const char *src = virDomainDiskGetSource(disk);
     int format = virDomainDiskGetFormat(disk);
@@ -361,7 +361,6 @@ xenFormatXMDisk(virConfValuePtr list,
     return 0;
 
  cleanup:
-    virBufferFreeAndReset(&buf);
     return -1;
 }