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

qemuBuildRNGCommandLine: use VIR_AUTOFREE

Browse Source 
Use separate variables for the chardev and the device.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Ján Tomko 2019-08-20 13:22:53 +02:00
parent 5253def175
commit 6e61843d07
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/qemu/qemu_command.c
View File

@ -5974,7 +5974,8 @@ qemuBuildRNGCommandLine(virLogManagerPtr logManager,
VIR_AUTOPTR(virJSONValue) props = NULL; VIR_AUTOPTR(virJSONValue) props = NULL;
virBuffer buf = VIR_BUFFER_INITIALIZER; virBuffer buf = VIR_BUFFER_INITIALIZER;
virDomainRNGDefPtr rng = def->rngs[i]; virDomainRNGDefPtr rng = def->rngs[i];
char *tmp; VIR_AUTOFREE(char *) chardev = NULL;
VIR_AUTOFREE(char *) devstr = NULL;
int rc; int rc;
if (!rng->info.alias) { if (!rng->info.alias) {
@ -5985,14 +5986,12 @@ qemuBuildRNGCommandLine(virLogManagerPtr logManager,
/* possibly add character device for backend */ /* possibly add character device for backend */
if (qemuBuildRNGBackendChrdevStr(logManager, secManager, cmd, cfg, def, if (qemuBuildRNGBackendChrdevStr(logManager, secManager, cmd, cfg, def,
rng, qemuCaps, &tmp, rng, qemuCaps, &chardev,
chardevStdioLogd) < 0) chardevStdioLogd) < 0)
return -1; return -1;
if (tmp) { if (chardev)
virCommandAddArgList(cmd, "-chardev", tmp, NULL); virCommandAddArgList(cmd, "-chardev", chardev, NULL);
VIR_FREE(tmp);
}
if (qemuBuildRNGBackendProps(rng, qemuCaps, &props) < 0) if (qemuBuildRNGBackendProps(rng, qemuCaps, &props) < 0)
return -1; return -1;
@ -6009,10 +6008,9 @@ qemuBuildRNGCommandLine(virLogManagerPtr logManager,
if (qemuCommandAddExtDevice(cmd, &rng->info) < 0) if (qemuCommandAddExtDevice(cmd, &rng->info) < 0)
return -1; return -1;
if (!(tmp = qemuBuildRNGDevStr(def, rng, qemuCaps))) if (!(devstr = qemuBuildRNGDevStr(def, rng, qemuCaps)))
return -1; return -1;
virCommandAddArgList(cmd, "-device", tmp, NULL); virCommandAddArgList(cmd, "-device", devstr, NULL);
VIR_FREE(tmp);
} }
return 0; return 0;