Completes the conversion to Error started in commit 015a1036^..d5124c00.
Signed-off-by: NMarkus Armbruster <armbru@redhat.com>
Reviewed-by: NRichard W.M. Jones <rjones@redhat.com>
Signed-off-by: NStefan Hajnoczi <stefanha@redhat.com>