diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-03-18 17:57:40 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-03-18 17:57:40 +0000 |
| commit | cf4b64406c0e7542b4e1852f5e5a743ad63cf36e (patch) | |
| tree | 20f21f76923373ca6748e970a77742e9b92f9e90 /block | |
| parent | b319df553707a3d44c7d027a5d5562f672a768a9 (diff) | |
| parent | 709dfb64925ed2b2978bf4c17ab98b2c7a9a05c1 (diff) | |
| download | qemu-cf4b64406c0e7542b4e1852f5e5a743ad63cf36e.zip qemu-cf4b64406c0e7542b4e1852f5e5a743ad63cf36e.tar.gz qemu-cf4b64406c0e7542b4e1852f5e5a743ad63cf36e.tar.bz2 | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2020-03-17' into staging
Error reporting patches for 2020-03-17
# gpg: Signature made Tue 17 Mar 2020 16:30:49 GMT
# 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-03-17:
hw/sd/ssi-sd: fix error handling in ssi_sd_realize
xen-block: Use one Error * variable instead of two
hw/misc/ivshmem: Use one Error * variable instead of two
Use &error_abort instead of separate assert()
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'block')
| -rw-r--r-- | block/monitor/block-hmp-cmds.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/block/monitor/block-hmp-cmds.c b/block/monitor/block-hmp-cmds.c index c3a6368..4c8c375 100644 --- a/block/monitor/block-hmp-cmds.c +++ b/block/monitor/block-hmp-cmds.c @@ -838,10 +838,8 @@ void hmp_info_blockstats(Monitor *mon, const QDict *qdict) void hmp_info_block_jobs(Monitor *mon, const QDict *qdict) { BlockJobInfoList *list; - Error *err = NULL; - list = qmp_query_block_jobs(&err); - assert(!err); + list = qmp_query_block_jobs(&error_abort); if (!list) { monitor_printf(mon, "No active jobs\n"); |