aboutsummaryrefslogtreecommitdiff
path: root/blockdev.c
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2018-12-13 18:31:13 +0100
committerLaurent Vivier <laurent@vivier.eu>2018-12-18 14:57:48 +0100
commitb2322003b6389c7c98104c8626ffa342928ba83c (patch)
treefac0963c8ee737e0b1db855722b001c046db1c8e /blockdev.c
parent92917cd25103569ad8992dbc5b4dc2dcacfdda7f (diff)
downloadqemu-b2322003b6389c7c98104c8626ffa342928ba83c.zip
qemu-b2322003b6389c7c98104c8626ffa342928ba83c.tar.gz
qemu-b2322003b6389c7c98104c8626ffa342928ba83c.tar.bz2
error: Remove NULL checks on error_propagate() calls
Patch created mechanically by rerunning: $ spatch --sp-file scripts/coccinelle/error_propagate_null.cocci \ --macro-file scripts/cocci-macro-file.h \ --dir . --in-place Whitespace tidied up manually. Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: Laurent Vivier <laurent@vivier.eu> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Message-Id: <20181213173113.11211-1-armbru@redhat.com> Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Diffstat (limited to 'blockdev.c')
-rw-r--r--blockdev.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/blockdev.c b/blockdev.c
index e6c8349..a6f71f9 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -992,9 +992,7 @@ DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfaceType block_default_type,
blk = blockdev_init(filename, bs_opts, &local_err);
bs_opts = NULL;
if (!blk) {
- if (local_err) {
- error_propagate(errp, local_err);
- }
+ error_propagate(errp, local_err);
goto fail;
} else {
assert(!local_err);