External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 19:32:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: command: use VIR_AUTOCLEAN in qemuBuildFS*

Browse Source 
Signed-off-by: Ján Tomko <jtomko@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Ján Tomko 2019-07-16 12:25:31 +02:00
parent acef350080
commit e6e7c41f84
1 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/qemu/qemu_command.c
View File

@ -2703,7 +2703,7 @@ qemuBuildDisksCommandLine(virCommandPtr cmd,
static char * static char *
qemuBuildFSStr(virDomainFSDefPtr fs) qemuBuildFSStr(virDomainFSDefPtr fs)
{ {
virBuffer opt = VIR_BUFFER_INITIALIZER; VIR_AUTOCLEAN(virBuffer) opt = VIR_BUFFER_INITIALIZER;
const char *driver = qemuDomainFSDriverTypeToString(fs->fsdriver); const char *driver = qemuDomainFSDriverTypeToString(fs->fsdriver);
const char *wrpolicy = virDomainFSWrpolicyTypeToString(fs->wrpolicy); const char *wrpolicy = virDomainFSWrpolicyTypeToString(fs->wrpolicy);
@ -2731,13 +2731,9 @@ qemuBuildFSStr(virDomainFSDefPtr fs)
virBufferAddLit(&opt, ",readonly"); virBufferAddLit(&opt, ",readonly");
if (virBufferCheckError(&opt) < 0) if (virBufferCheckError(&opt) < 0)
goto error; return NULL;
return virBufferContentAndReset(&opt); return virBufferContentAndReset(&opt);
error:
virBufferFreeAndReset(&opt);
return NULL;
} }
@ -2746,12 +2742,11 @@ qemuBuildFSDevStr(const virDomainDef *def,
virDomainFSDefPtr fs, virDomainFSDefPtr fs,
virQEMUCapsPtr qemuCaps) virQEMUCapsPtr qemuCaps)
{ {
virBuffer opt = VIR_BUFFER_INITIALIZER; VIR_AUTOCLEAN(virBuffer) opt = VIR_BUFFER_INITIALIZER;
if (qemuBuildVirtioDevStr(&opt, "virtio-9p", qemuCaps, if (qemuBuildVirtioDevStr(&opt, "virtio-9p", qemuCaps,
VIR_DOMAIN_DEVICE_FS, fs) < 0) { VIR_DOMAIN_DEVICE_FS, fs) < 0)
goto error; return NULL;
}
virBufferAsprintf(&opt, ",id=%s", fs->info.alias); virBufferAsprintf(&opt, ",id=%s", fs->info.alias);
virBufferAsprintf(&opt, ",fsdev=%s%s", virBufferAsprintf(&opt, ",fsdev=%s%s",
@ -2760,19 +2755,15 @@ qemuBuildFSDevStr(const virDomainDef *def,
virQEMUBuildBufferEscapeComma(&opt, fs->dst); virQEMUBuildBufferEscapeComma(&opt, fs->dst);
if (qemuBuildVirtioOptionsStr(&opt, fs->virtio, qemuCaps) < 0) if (qemuBuildVirtioOptionsStr(&opt, fs->virtio, qemuCaps) < 0)
goto error; return NULL;
if (qemuBuildDeviceAddressStr(&opt, def, &fs->info, qemuCaps) < 0) if (qemuBuildDeviceAddressStr(&opt, def, &fs->info, qemuCaps) < 0)
goto error; return NULL;
if (virBufferCheckError(&opt) < 0) if (virBufferCheckError(&opt) < 0)
goto error; return NULL;
return virBufferContentAndReset(&opt); return virBufferContentAndReset(&opt);
error:
virBufferFreeAndReset(&opt);
return NULL;
} }