Commit 526ab8e8 authored by Markus Armbruster's avatar Markus Armbruster
Browse files

xen-block: Use one Error * variable instead of two 



While there, tidy up indentation, and add return just for consistency
and robustness.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Message-Id: <20200313170517.22480-4-armbru@redhat.com>
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: default avatarVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
[The "while there" cleanups squashed in]
parent 364effc0

hw/block/xen-block.c

+4 −6
Original line number Diff line number Diff line
@@ -998,14 +998,13 @@ static void xen_block_device_destroy(XenBackendInstance *backend, 
    XenBlockVdev *vdev = &blockdev->props.vdev;

    XenBlockDrive *drive = blockdev->drive;

    XenBlockIOThread *iothread = blockdev->iothread;

    Error *local_err = NULL;



    trace_xen_block_device_destroy(vdev->number);



    object_unparent(OBJECT(xendev));



    if (iothread) {

        Error *local_err = NULL;



        xen_block_iothread_destroy(iothread, &local_err);

        if (local_err) {

            error_propagate_prepend(errp, local_err,
@@ -1015,12 +1014,11 @@ static void xen_block_device_destroy(XenBackendInstance *backend, 
    }



    if (drive) {

        Error *local_err = NULL;



        xen_block_drive_destroy(drive, &local_err);

        if (local_err) {

            error_propagate_prepend(errp, local_err,

                                    "failed to destroy drive: ");

            return;

        }

    }

}