david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hw/arm/virt: Fix property "gic-version" error handling

Browse Source 
virt_set_gic_version() calls exit(1) when passed an invalid property
value.  Property setters are not supposed to do that.  Screwed up in
commit b92ad39.  Harmless, because the property belongs to a machine.
Set an error object instead.

Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: qemu-arm@nongnu.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Markus Armbruster 2015-12-17 17:35:15 +01:00
parent 543202c0dd
commit 7b55044f9d
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hw/arm/virt.c
View File

@ -1200,9 +1200,8 @@ static void virt_set_gic_version(Object *obj, const char *value, Error **errp)
} else if (!strcmp(value, "host")) { } else if (!strcmp(value, "host")) {
vms->gic_version = 0; /* Will probe later */ vms->gic_version = 0; /* Will probe later */
} else { } else {
error_report("Invalid gic-version option value"); error_setg(errp, "Invalid gic-version value");
error_printf("Allowed gic-version values are: 3, 2, host\n"); error_append_hint(errp, "Valid values are 3, 2, host.\n");
exit(1);
} }
} }