From: Cornelia Huck <cohuck@redhat.com>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: Cornelia Huck <cohuck@redhat.com>,
qemu-s390x@nongnu.org, David Hildenbrand <david@redhat.com>,
qemu-devel@nongnu.org, Markus Armbruster <armbru@redhat.com>
Subject: [PULL v2 14/16] s390x/cpumodel: Fix query-cpu-definitions error API violations
Date: Sat, 14 Dec 2019 10:45:24 +0100 [thread overview]
Message-ID: <20191214094526.8698-15-cohuck@redhat.com> (raw)
In-Reply-To: <20191214094526.8698-1-cohuck@redhat.com>
From: Markus Armbruster <armbru@redhat.com>
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 <david@redhat.com>
Cc: Cornelia Huck <cohuck@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Message-Id: <20191204093625.14836-16-armbru@redhat.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
---
target/s390x/cpu_models.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c
index 3ed301b5e509..547bab8ac392 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);
--
2.21.0
next prev parent reply other threads:[~2019-12-14 9:58 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-14 9:45 [PULL v2 00/16] first s390x update for 5.0 Cornelia Huck
2019-12-14 9:45 ` [PULL v2 01/16] vfio-ccw: Fix error message Cornelia Huck
2019-12-14 9:45 ` [PULL v2 02/16] hw: add compat machines for 5.0 Cornelia Huck
2019-12-14 9:45 ` [PULL v2 03/16] s390x: Don't do a normal reset on the initial cpu Cornelia Huck
2019-12-14 9:45 ` [PULL v2 04/16] s390x: Move reset normal to shared reset handler Cornelia Huck
2019-12-14 9:45 ` [PULL v2 05/16] s390x: Move initial reset Cornelia Huck
2019-12-14 9:45 ` [PULL v2 06/16] s390x: Move clear reset Cornelia Huck
2019-12-14 9:45 ` [PULL v2 07/16] s390x: Beautify diag308 handling Cornelia Huck
2019-12-14 9:45 ` [PULL v2 08/16] s390x: kvm: Make kvm_sclp_service_call void Cornelia Huck
2019-12-14 9:45 ` [PULL v2 09/16] s390x: Fix cpu normal reset ri clearing Cornelia Huck
2019-12-14 9:45 ` [PULL v2 10/16] s390x/event-facility: Fix realize() error API violations Cornelia Huck
2019-12-14 9:45 ` [PULL v2 11/16] s390x/cpumodel: Fix feature property " Cornelia Huck
2019-12-14 9:45 ` [PULL v2 12/16] s390x/cpumodel: Fix realize() " Cornelia Huck
2019-12-14 9:45 ` [PULL v2 13/16] s390x/cpumodel: Fix query-cpu-model-FOO " Cornelia Huck
2019-12-14 9:45 ` Cornelia Huck [this message]
2019-12-14 9:45 ` [PULL v2 15/16] s390x/tcg: clear local interrupts on reset normal Cornelia Huck
2019-12-14 9:45 ` [PULL v2 16/16] qga: fence guest-set-time if hwclock not available Cornelia Huck
2020-01-03 12:05 ` Peter Maydell
2019-12-16 13:04 ` [PULL v2 00/16] first s390x update for 5.0 Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191214094526.8698-15-cohuck@redhat.com \
--to=cohuck@redhat.com \
--cc=armbru@redhat.com \
--cc=david@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).