External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-20 07:59:00 +00:00
Code

qemu: eliminate ret in qemuExtDevicesStart

Browse Source 
All the callees return either 0 or -1 so there is no need
for propagating the value. And we bail on the first error.

Remove the variable to make the function simpler.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Ján Tomko 2020-01-24 19:43:18 +01:00
parent e2ca6eb087
commit d5256cbd55
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/qemu/qemu_extdevice.c
View File

@ -156,7 +156,6 @@ qemuExtDevicesStart(virQEMUDriverPtr driver,
bool incomingMigration) bool incomingMigration)
{ {
virDomainDefPtr def = vm->def; virDomainDefPtr def = vm->def;
int ret = 0;
size_t i; size_t i;
if (qemuExtDevicesInitPaths(driver, def) < 0) if (qemuExtDevicesInitPaths(driver, def) < 0)
@ -166,14 +165,13 @@ qemuExtDevicesStart(virQEMUDriverPtr driver,
virDomainVideoDefPtr video = def->videos[i]; virDomainVideoDefPtr video = def->videos[i];
if (video->backend == VIR_DOMAIN_VIDEO_BACKEND_TYPE_VHOSTUSER) { if (video->backend == VIR_DOMAIN_VIDEO_BACKEND_TYPE_VHOSTUSER) {
ret = qemuExtVhostUserGPUStart(driver, vm, video); if (qemuExtVhostUserGPUStart(driver, vm, video) < 0)
if (ret < 0) return -1;
return ret;
} }
} }
if (def->tpm) if (def->tpm && qemuExtTPMStart(driver, vm, incomingMigration) < 0)
ret = qemuExtTPMStart(driver, vm, incomingMigration); return -1;
for (i = 0; i < def->nnets; i++) { for (i = 0; i < def->nnets; i++) {
virDomainNetDefPtr net = def->nets[i]; virDomainNetDefPtr net = def->nets[i];
@ -184,7 +182,7 @@ qemuExtDevicesStart(virQEMUDriverPtr driver,
return -1; return -1;
} }
return ret; return 0;
} }