From: Markus Armbruster Date: Wed, 4 Dec 2019 09:36:22 +0000 (+0100) Subject: s390x/cpumodel: Fix query-cpu-definitions error API violations X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=7dcb1baeaefee577ae73b9569215f426d48b4ffc;p=qemu.git s390x/cpumodel: Fix query-cpu-definitions error API violations qmp_query_cpu_definitions() passes @errp to get_max_cpu_model(), then frees any error it gets back. This effectively ignores errors. Dereferencing @errp is wrong; see the big comment in error.h. Passing @errp is also wrong, because it works only as long as @errp is neither @error_fatal nor @error_abort. Introduced in commit 38cba1f4d8 "s390x: return unavailable features via query-cpu-definitions". No caller actually passes such @errp values. Fix anyway: simply pass NULL to get_max_cpu_model(). Cc: David Hildenbrand Cc: Cornelia Huck Signed-off-by: Markus Armbruster Reviewed-by: David Hildenbrand Message-Id: <20191204093625.14836-16-armbru@redhat.com> Signed-off-by: Cornelia Huck --- diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c index 3ed301b5e5..547bab8ac3 100644 --- a/target/s390x/cpu_models.c +++ b/target/s390x/cpu_models.c @@ -462,11 +462,7 @@ CpuDefinitionInfoList *qmp_query_cpu_definitions(Error **errp) .list = NULL, }; - list_data.model = get_max_cpu_model(errp); - if (*errp) { - error_free(*errp); - *errp = NULL; - } + list_data.model = get_max_cpu_model(NULL); object_class_foreach(create_cpu_model_list, TYPE_S390_CPU, false, &list_data);