On 3/13/20 6:05 PM, Markus Armbruster wrote:
Signed-off-by: Markus Armbruster <arm...@redhat.com>
---
  hw/block/xen-block.c | 5 +----
  1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/hw/block/xen-block.c b/hw/block/xen-block.c
index 3885464513..7b3b6dee97 100644
--- a/hw/block/xen-block.c
+++ b/hw/block/xen-block.c
@@ -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,8 +1014,6 @@ 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,


Reviewed-by: Philippe Mathieu-Daudé <phi...@redhat.com>


Reply via email to