Commit b2322003 authored by Markus Armbruster's avatar Markus Armbruster Committed by Laurent Vivier
Browse files

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: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarLaurent Vivier <laurent@vivier.eu>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20181213173113.11211-1-armbru@redhat.com>
Signed-off-by: default avatarLaurent Vivier <laurent@vivier.eu>
parent 92917cd2

blockdev.c

+1 −3
Original line number Diff line number Diff line
@@ -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);

        }

        goto fail;

    } else {

        assert(!local_err);

hw/s390x/s390-pci-bus.c

+1 −3
Original line number Diff line number Diff line
@@ -731,10 +731,8 @@ static void s390_pcihost_realize(DeviceState *dev, Error **errp) 


    css_register_io_adapters(CSS_IO_ADAPTER_PCI, true, false,

                             S390_ADAPTER_SUPPRESSIBLE, &local_err);

    if (local_err) {

    error_propagate(errp, local_err);

}

}



static int s390_pci_msix_init(S390PCIBusDevice *pbdev)

{

qga/commands-posix.c

+2 −5
Original line number Diff line number Diff line
@@ -1573,10 +1573,7 @@ static bool systemd_supports_mode(SuspendMode mode, Error **errp) 
        return true;

    }



    if (local_err) {

    error_propagate(errp, local_err);

    }



    return false;

}
@@ -1782,7 +1779,7 @@ static void guest_suspend(SuspendMode mode, Error **errp) 
    if (!mode_supported) {

        error_setg(errp,

                   "the requested suspend mode is not supported by the guest");

    } else if (local_err) {

    } else {

        error_propagate(errp, local_err);

    }

}