openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Markus Armbruster 2018-12-13 18:31:13 +01:00 committed by Laurent Vivier
parent 92917cd251
commit b2322003b6
3 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
blockdev.c
View File

@ -992,9 +992,7 @@ DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfaceType block_default_type,
blk = blockdev_init(filename, bs_opts, &local_err); blk = blockdev_init(filename, bs_opts, &local_err);
bs_opts = NULL; bs_opts = NULL;
if (!blk) { if (!blk) {
if (local_err) { error_propagate(errp, local_err);
error_propagate(errp, local_err);
}
goto fail; goto fail;
} else { } else {
assert(!local_err); assert(!local_err);

4
hw/s390x/s390-pci-bus.c
View File

@ -731,9 +731,7 @@ static void s390_pcihost_realize(DeviceState *dev, Error **errp)
css_register_io_adapters(CSS_IO_ADAPTER_PCI, true, false, css_register_io_adapters(CSS_IO_ADAPTER_PCI, true, false,
S390_ADAPTER_SUPPRESSIBLE, &local_err); S390_ADAPTER_SUPPRESSIBLE, &local_err);
if (local_err) { error_propagate(errp, local_err);
error_propagate(errp, local_err);
}
} }
static int s390_pci_msix_init(S390PCIBusDevice *pbdev) static int s390_pci_msix_init(S390PCIBusDevice *pbdev)

7
qga/commands-posix.c
View File

@ -1573,10 +1573,7 @@ static bool systemd_supports_mode(SuspendMode mode, Error **errp)
return true; return true;
} }
if (local_err) { error_propagate(errp, local_err);
error_propagate(errp, local_err);
}
return false; return false;
} }
@ -1782,7 +1779,7 @@ static void guest_suspend(SuspendMode mode, Error **errp)
if (!mode_supported) { if (!mode_supported) {
error_setg(errp, error_setg(errp,
"the requested suspend mode is not supported by the guest"); "the requested suspend mode is not supported by the guest");
} else if (local_err) { } else {
error_propagate(errp, local_err); error_propagate(errp, local_err);
} }
} }