OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

vhost-user-scsi: free the inflight area when reset

Browse Source 
Keep it the same to vhost-user-blk.
At the same time, fix the vhost_reset_device.

Signed-off-by: Li Feng <fengli@smartx.com>
Message-Id: <20231123055431.217792-3-fengli@smartx.com>
Reviewed-by: Raphael Norwitz <raphael.norwitz@nutanix.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Li Feng 2023-11-23 13:54:12 +08:00 committed by Michael S. Tsirkin
parent 298d4f892e
commit 95e1019a4a
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hw/scsi/vhost-user-scsi.c
View File

@ -360,6 +360,20 @@ static Property vhost_user_scsi_properties[] = {
DEFINE_PROP_END_OF_LIST(), DEFINE_PROP_END_OF_LIST(),
}; };
static void vhost_user_scsi_reset(VirtIODevice *vdev)
{
VHostUserSCSI *s = VHOST_USER_SCSI(vdev);
VHostSCSICommon *vsc = VHOST_SCSI_COMMON(s);
vhost_dev_free_inflight(vsc->inflight);
}
static struct vhost_dev *vhost_user_scsi_get_vhost(VirtIODevice *vdev)
{
VHostSCSICommon *vsc = VHOST_SCSI_COMMON(vdev);
return &vsc->dev;
}
static const VMStateDescription vmstate_vhost_scsi = { static const VMStateDescription vmstate_vhost_scsi = {
.name = "virtio-scsi", .name = "virtio-scsi",
.minimum_version_id = 1, .minimum_version_id = 1,
@ -385,6 +399,8 @@ static void vhost_user_scsi_class_init(ObjectClass *klass, void *data)
vdc->set_config = vhost_scsi_common_set_config; vdc->set_config = vhost_scsi_common_set_config;
vdc->set_status = vhost_user_scsi_set_status; vdc->set_status = vhost_user_scsi_set_status;
fwc->get_dev_path = vhost_scsi_common_get_fw_dev_path; fwc->get_dev_path = vhost_scsi_common_get_fw_dev_path;
vdc->reset = vhost_user_scsi_reset;
vdc->get_vhost = vhost_user_scsi_get_vhost;
} }
static void vhost_user_scsi_instance_init(Object *obj) static void vhost_user_scsi_instance_init(Object *obj)

2
hw/virtio/virtio.c
View File

@ -2137,7 +2137,7 @@ void virtio_reset(void *opaque)
vdev->device_endian = virtio_default_endian(); vdev->device_endian = virtio_default_endian();
} }
if (vdev->vhost_started) { if (vdev->vhost_started && k->get_vhost) {
vhost_reset_device(k->get_vhost(vdev)); vhost_reset_device(k->get_vhost(vdev));
} }