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

xenconfig: Remove pointless label in xenParseSxprSound

Browse Source 
The 'error' label just returned -1. Inline it.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2019-07-03 08:41:38 +02:00
parent 48a0924740
commit 4fbecf4432
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/xenconfig/xen_sxpr.c
View File

@ -303,13 +303,13 @@ xenParseSxprSound(virDomainDefPtr def,
if (VIR_ALLOC_N(def->sounds, if (VIR_ALLOC_N(def->sounds,
VIR_DOMAIN_SOUND_MODEL_ES1370 + 1) < 0) VIR_DOMAIN_SOUND_MODEL_ES1370 + 1) < 0)
goto error; return -1;
for (i = 0; i < (VIR_DOMAIN_SOUND_MODEL_ES1370 + 1); i++) { for (i = 0; i < (VIR_DOMAIN_SOUND_MODEL_ES1370 + 1); i++) {
virDomainSoundDefPtr sound; virDomainSoundDefPtr sound;
if (VIR_ALLOC(sound) < 0) if (VIR_ALLOC(sound) < 0)
goto error; return -1;
sound->model = i; sound->model = i;
def->sounds[def->nsounds++] = sound; def->sounds[def->nsounds++] = sound;
} }
@ -329,20 +329,20 @@ xenParseSxprSound(virDomainDefPtr def,
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("Sound model %s too big for destination"), _("Sound model %s too big for destination"),
offset); offset);
goto error; return -1;
} }
if (VIR_ALLOC(sound) < 0) if (VIR_ALLOC(sound) < 0)
goto error; return -1;
if ((sound->model = virDomainSoundModelTypeFromString(model)) < 0) { if ((sound->model = virDomainSoundModelTypeFromString(model)) < 0) {
VIR_FREE(sound); VIR_FREE(sound);
goto error; return -1;
} }
if (VIR_APPEND_ELEMENT(def->sounds, def->nsounds, sound) < 0) { if (VIR_APPEND_ELEMENT(def->sounds, def->nsounds, sound) < 0) {
virDomainSoundDefFree(sound); virDomainSoundDefFree(sound);
goto error; return -1;
} }
offset = offset2 ? offset2 + 1 : NULL; offset = offset2 ? offset2 + 1 : NULL;
@ -350,7 +350,4 @@ xenParseSxprSound(virDomainDefPtr def,
} }
return 0; return 0;
error:
return -1;
} }