summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorMax Reitz <mreitz@redhat.com>2014-04-29 18:32:25 +0200
committerKevin Wolf <kwolf@redhat.com>2014-04-30 12:43:30 +0200
commit35d0d40a034b2392f48f91e4e00c8c94e3526a19 (patch)
tree954098af8d0e64a78824eb939ba8e62d98162aef
parentf1f25a2e2ea0cd3cdc7d01f2e0afbc4aef6fb853 (diff)
downloadfocaccia-qemu-35d0d40a034b2392f48f91e4e00c8c94e3526a19.tar.gz
focaccia-qemu-35d0d40a034b2392f48f91e4e00c8c94e3526a19.zip
block: Use error_abort in bdrv_image_info_specific_dump()
Currently, bdrv_image_info_specific_dump() uses an error variable for
visit_type_ImageInfoSpecific, but ignores the result. As this function
is used here with an output visitor to transform the ImageInfoSpecific
object to a generic QDict, an error should actually be impossible. It is
however better to assert that this is indeed the case. This is done by
this patch using error_abort instead of an unused local Error variable.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reported-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-rw-r--r--block/qapi.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/block/qapi.c b/block/qapi.c
index 8f2b4dbe7d..af114452e0 100644
--- a/block/qapi.c
+++ b/block/qapi.c
@@ -532,12 +532,11 @@ static void dump_qdict(fprintf_function func_fprintf, void *f, int indentation,
 void bdrv_image_info_specific_dump(fprintf_function func_fprintf, void *f,
                                    ImageInfoSpecific *info_spec)
 {
-    Error *local_err = NULL;
     QmpOutputVisitor *ov = qmp_output_visitor_new();
     QObject *obj, *data;
 
     visit_type_ImageInfoSpecific(qmp_output_get_visitor(ov), &info_spec, NULL,
-                                 &local_err);
+                                 &error_abort);
     obj = qmp_output_get_qobject(ov);
     assert(qobject_type(obj) == QTYPE_QDICT);
     data = qdict_get(qobject_to_qdict(obj), "data");