Commit 2a3b9cba authored by Eric Farman's avatar Eric Farman Committed by Cornelia Huck
Browse files

vfio-ccw: Refactor cleanup of regions 



While we're at it, add a g_free() for the async_cmd_region that
is the last thing currently created.  g_free() knows how to handle
NULL pointers, so this makes it easier to remember what cleanups
need to be performed when new regions are added.

Signed-off-by: default avatarEric Farman <farman@linux.ibm.com>
Reviewed-by: default avatarCornelia Huck <cohuck@redhat.com>
Message-Id: <20200505125757.98209-3-farman@linux.ibm.com>
Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
parent f76b348e

hw/vfio/ccw.c

+9 −5
Original line number Diff line number Diff line
@@ -363,8 +363,7 @@ static void vfio_ccw_get_region(VFIOCCWDevice *vcdev, Error **errp) 
    vcdev->io_region_size = info->size;

    if (sizeof(*vcdev->io_region) != vcdev->io_region_size) {

        error_setg(errp, "vfio: Unexpected size of the I/O region");

        g_free(info);

        return;

        goto out_err;

    }



    vcdev->io_region_offset = info->offset;
@@ -377,15 +376,20 @@ static void vfio_ccw_get_region(VFIOCCWDevice *vcdev, Error **errp) 
        vcdev->async_cmd_region_size = info->size;

        if (sizeof(*vcdev->async_cmd_region) != vcdev->async_cmd_region_size) {

            error_setg(errp, "vfio: Unexpected size of the async cmd region");

            g_free(vcdev->io_region);

            g_free(info);

            return;

            goto out_err;

        }

        vcdev->async_cmd_region_offset = info->offset;

        vcdev->async_cmd_region = g_malloc0(info->size);

    }



    g_free(info);

    return;



out_err:

    g_free(vcdev->async_cmd_region);

    g_free(vcdev->io_region);

    g_free(info);

    return;

}



static void vfio_ccw_put_region(VFIOCCWDevice *vcdev)