diff options
| author | Markus Armbruster <armbru@redhat.com> | 2015-12-17 17:35:15 +0100 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2016-01-13 11:58:58 +0100 |
| commit | 7b55044f9d96ec518e7ab58bd8a3637b52a35f79 (patch) | |
| tree | e2fc39247c299d290a31458e981a20ab2b073515 /hw | |
| parent | 543202c0ddbcc4ee97d82fe45356e1ab00093f90 (diff) | |
| download | qemu-7b55044f9d96ec518e7ab58bd8a3637b52a35f79.zip qemu-7b55044f9d96ec518e7ab58bd8a3637b52a35f79.tar.gz qemu-7b55044f9d96ec518e7ab58bd8a3637b52a35f79.tar.bz2 | |
hw/arm/virt: Fix property "gic-version" error handling
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>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/arm/virt.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/hw/arm/virt.c b/hw/arm/virt.c index fd52b76..92dcd02 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1200,9 +1200,8 @@ static void virt_set_gic_version(Object *obj, const char *value, Error **errp) } else if (!strcmp(value, "host")) { vms->gic_version = 0; /* Will probe later */ } else { - error_report("Invalid gic-version option value"); - error_printf("Allowed gic-version values are: 3, 2, host\n"); - exit(1); + error_setg(errp, "Invalid gic-version value"); + error_append_hint(errp, "Valid values are 3, 2, host.\n"); } } |