diff options
author | Markus Armbruster | 2020-05-05 12:19:01 +0200 |
---|---|---|
committer | Markus Armbruster | 2020-05-27 07:45:25 +0200 |
commit | 5e959d2e6e698af86a7064ead87ebe47706d99c7 (patch) | |
tree | 2eb10fa0dfd8932a44f8cb67ba656711203b590c | |
parent | xen: Fix and improve handling of device_add usb-host errors (diff) | |
download | qemu-5e959d2e6e698af86a7064ead87ebe47706d99c7.tar.gz qemu-5e959d2e6e698af86a7064ead87ebe47706d99c7.tar.xz qemu-5e959d2e6e698af86a7064ead87ebe47706d99c7.zip |
s390x/cpumodel: Fix harmless misuse of visit_check_struct()
Commit e47970f51d "s390x/cpumodel: Fix query-cpu-model-FOO error API
violations" neglected to change visit_check_struct()'s Error **
argument along with the others. If visit_check_struct() failed, we'd
take the success path. Fortunately, it can't fail here:
qobject_input_check_struct() checks we consumed the whole dictionary,
and to get here, we did. Fix it anyway.
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>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Message-Id: <20200505101908.6207-4-armbru@redhat.com>
-rw-r--r-- | target/s390x/cpu_models.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c index 8efe6ed514..2fa609bffe 100644 --- a/target/s390x/cpu_models.c +++ b/target/s390x/cpu_models.c @@ -524,7 +524,7 @@ static void cpu_model_from_info(S390CPUModel *model, const CpuModelInfo *info, } } if (!err) { - visit_check_struct(visitor, errp); + visit_check_struct(visitor, &err); } visit_end_struct(visitor, NULL); visit_free(visitor); |