diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-05-28 11:21:30 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-05-28 11:21:30 +0100 |
| commit | aacc7c8be2900f1f0a2a1bd241c5eeb58878bb28 (patch) | |
| tree | 57e8078cdf00f69f1940a2663ede9a95136b20f9 /tests/qtest | |
| parent | 8b92b9ef86077f9ec77998666cd7de137c33e9bf (diff) | |
| parent | 49e2fa85ff04a9be89ed15f922c7d8dae2be9e74 (diff) | |
| download | qemu-aacc7c8be2900f1f0a2a1bd241c5eeb58878bb28.zip qemu-aacc7c8be2900f1f0a2a1bd241c5eeb58878bb28.tar.gz qemu-aacc7c8be2900f1f0a2a1bd241c5eeb58878bb28.tar.bz2 | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2020-05-27' into staging
Error reporting patches for 2020-05-27
# gpg: Signature made Wed 27 May 2020 06:48:02 BST
# gpg: using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653
# gpg: issuer "armbru@redhat.com"
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full]
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>" [full]
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653
* remotes/armbru/tags/pull-error-2020-05-27:
i386: Fix x86_cpu_load_model() error API violation
arm/sabrelite: Consistently use &error_fatal in sabrelite_init()
mips/boston: Plug memory leak in boston_mach_init()
mips/boston: Fix boston_mach_init() error handling
mips/malta: Fix create_cps() error handling
error: Use error_reportf_err() where appropriate
tests/migration: Tighten error checking
s390x/cpumodel: Fix harmless misuse of visit_check_struct()
xen: Fix and improve handling of device_add usb-host errors
nvdimm: Plug memory leak in uuid property setter
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests/qtest')
| -rw-r--r-- | tests/qtest/migration-test.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c index 2568c95..dc3490c 100644 --- a/tests/qtest/migration-test.c +++ b/tests/qtest/migration-test.c @@ -13,6 +13,7 @@ #include "qemu/osdep.h" #include "libqtest.h" +#include "qapi/error.h" #include "qapi/qmp/qdict.h" #include "qemu/module.h" #include "qemu/option.h" @@ -301,7 +302,6 @@ static char *migrate_get_socket_address(QTestState *who, const char *parameter) { QDict *rsp; char *result; - Error *local_err = NULL; SocketAddressList *addrs; Visitor *iv = NULL; QObject *object; @@ -310,7 +310,7 @@ static char *migrate_get_socket_address(QTestState *who, const char *parameter) object = qdict_get(rsp, parameter); iv = qobject_input_visitor_new(object); - visit_type_SocketAddressList(iv, NULL, &addrs, &local_err); + visit_type_SocketAddressList(iv, NULL, &addrs, &error_abort); visit_free(iv); /* we are only using a single address */ |