NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

libxl: 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:21:30 -04:00
parent fc81c07427
commit 7a6bfea145
6 changed files with 17 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libxl/libxl_conf.c
View File

@ -911,7 +911,7 @@ libxlMakeNetworkDiskSrcStr(virStorageSourcePtr src,
const char *secret) const char *secret)
{ {
char *ret = NULL; char *ret = NULL;
virBuffer buf = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
size_t i; size_t i;
switch ((virStorageNetProtocol) src->protocol) { switch ((virStorageNetProtocol) src->protocol) {
@ -978,7 +978,6 @@ libxlMakeNetworkDiskSrcStr(virStorageSourcePtr src,
} }
cleanup: cleanup:
virBufferFreeAndReset(&buf);
return ret; return ret;
} }
@ -1241,7 +1240,7 @@ libxlMakeNic(virDomainDefPtr def,
const virNetDevBandwidth *actual_bw; const virNetDevBandwidth *actual_bw;
const virNetDevVPortProfile *port_profile; const virNetDevVPortProfile *port_profile;
const virNetDevVlan *virt_vlan; const virNetDevVlan *virt_vlan;
virBuffer buf = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
size_t i; size_t i;
const char *script = NULL; const char *script = NULL;
int ret = -1; int ret = -1;
@ -1434,7 +1433,6 @@ libxlMakeNic(virDomainDefPtr def,
ret = 0; ret = 0;
cleanup: cleanup:
virBufferFreeAndReset(&buf);
virObjectUnref(network); virObjectUnref(network);
virObjectUnref(conn); virObjectUnref(conn);

2
src/libxl/libxl_driver.c
View File

@ -942,7 +942,7 @@ static char *
libxlConnectGetSysinfo(virConnectPtr conn, unsigned int flags) libxlConnectGetSysinfo(virConnectPtr conn, unsigned int flags)
{ {
libxlDriverPrivatePtr driver = conn->privateData; libxlDriverPrivatePtr driver = conn->privateData;
virBuffer buf = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
virCheckFlags(0, NULL); virCheckFlags(0, NULL);

2
src/libxl/libxl_migration.c
View File

@ -117,7 +117,7 @@ libxlMigrationBakeCookie(libxlMigrationCookiePtr mig,
char **cookieout, char **cookieout,
int *cookieoutlen) int *cookieoutlen)
{ {
virBuffer buf = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
char uuidstr[VIR_UUID_STRING_BUFLEN]; char uuidstr[VIR_UUID_STRING_BUFLEN];
if (!cookieout || !cookieoutlen) if (!cookieout || !cookieoutlen)

12
src/libxl/xen_common.c
View File

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

19
src/libxl/xen_xl.c
View File

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

3
src/libxl/xen_xm.c
View File

@ -290,7 +290,7 @@ static int
xenFormatXMDisk(virConfValuePtr list, xenFormatXMDisk(virConfValuePtr list,
virDomainDiskDefPtr disk) virDomainDiskDefPtr disk)
{ {
virBuffer buf = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
virConfValuePtr val, tmp; virConfValuePtr val, tmp;
const char *src = virDomainDiskGetSource(disk); const char *src = virDomainDiskGetSource(disk);
int format = virDomainDiskGetFormat(disk); int format = virDomainDiskGetFormat(disk);
@ -361,7 +361,6 @@ xenFormatXMDisk(virConfValuePtr list,
return 0; return 0;
cleanup: cleanup:
virBufferFreeAndReset(&buf);
return -1; return -1;
} }