Commit 68fa7ca0 authored by Xie Yongji's avatar Xie Yongji Committed by Paolo Bonzini
Browse files

vhost-user-scsi: Call virtio_scsi_common_unrealize() when device realize failed 



This avoids memory leak when device hotplug is failed.

Signed-off-by: default avatarXie Yongji <xieyongji@baidu.com>
Message-Id: <20190717004606.12444-2-xieyongji@baidu.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 934443c3

hw/scsi/vhost-user-scsi.c

+10 −4
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ static void vhost_user_scsi_realize(DeviceState *dev, Error **errp) 
    }



    if (!vhost_user_init(&s->vhost_user, &vs->conf.chardev, errp)) {

        return;

        goto free_virtio;

    }



    vsc->dev.nvqs = 2 + vs->conf.num_queues;
@@ -101,15 +101,21 @@ static void vhost_user_scsi_realize(DeviceState *dev, Error **errp) 
    if (ret < 0) {

        error_setg(errp, "vhost-user-scsi: vhost initialization failed: %s",

                   strerror(-ret));

        vhost_user_cleanup(&s->vhost_user);

        g_free(vqs);

        return;

        goto free_vhost;

    }



    /* Channel and lun both are 0 for bootable vhost-user-scsi disk */

    vsc->channel = 0;

    vsc->lun = 0;

    vsc->target = vs->conf.boot_tpgt;



    return;



free_vhost:

    vhost_user_cleanup(&s->vhost_user);

    g_free(vqs);

free_virtio:

    virtio_scsi_common_unrealize(dev);

}



static void vhost_user_scsi_unrealize(DeviceState *dev, Error **errp)