ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Markus Armbruster <armbru@redhat.com>
Message-Id: <20200313170517.22480-4-armbru@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
[The "while there" cleanups squashed in]
This commit is contained in:
Markus Armbruster 2020-03-13 18:05:17 +01:00
parent 364effc0eb
commit 526ab8e863
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/block/xen-block.c
View File

@ -998,14 +998,13 @@ static void xen_block_device_destroy(XenBackendInstance *backend,
XenBlockVdev *vdev = &blockdev->props.vdev; XenBlockVdev *vdev = &blockdev->props.vdev;
XenBlockDrive *drive = blockdev->drive; XenBlockDrive *drive = blockdev->drive;
XenBlockIOThread *iothread = blockdev->iothread; XenBlockIOThread *iothread = blockdev->iothread;
Error *local_err = NULL;
trace_xen_block_device_destroy(vdev->number); trace_xen_block_device_destroy(vdev->number);
object_unparent(OBJECT(xendev)); object_unparent(OBJECT(xendev));
if (iothread) { if (iothread) {
Error *local_err = NULL;
xen_block_iothread_destroy(iothread, &local_err); xen_block_iothread_destroy(iothread, &local_err);
if (local_err) { if (local_err) {
error_propagate_prepend(errp, local_err, error_propagate_prepend(errp, local_err,
@ -1015,12 +1014,11 @@ static void xen_block_device_destroy(XenBackendInstance *backend,
} }
if (drive) { if (drive) {
Error *local_err = NULL;
xen_block_drive_destroy(drive, &local_err); xen_block_drive_destroy(drive, &local_err);
if (local_err) { if (local_err) {
error_propagate_prepend(errp, local_err, error_propagate_prepend(errp, local_err,
"failed to destroy drive: "); "failed to destroy drive: ");
return;
} }
} }
} }