[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 1/6] vhost-user-fs: Back up vqs before cleaning up vhost_dev
From: |
Stefan Hajnoczi |
Subject: |
[PULL 1/6] vhost-user-fs: Back up vqs before cleaning up vhost_dev |
Date: |
Thu, 9 Feb 2023 10:25:15 -0500 |
From: Akihiko Odaki <akihiko.odaki@daynix.com>
vhost_dev_cleanup() clears vhost_dev so back up its vqs member to free
the memory pointed by the member.
Fixes: 98fc1ada4c ("virtio: add vhost-user-fs base device")
Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20230130140225.77964-1-akihiko.odaki@daynix.com>
---
hw/virtio/vhost-user-fs.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/virtio/vhost-user-fs.c b/hw/virtio/vhost-user-fs.c
index f5049735ac..83fc20e49e 100644
--- a/hw/virtio/vhost-user-fs.c
+++ b/hw/virtio/vhost-user-fs.c
@@ -273,6 +273,7 @@ static void vuf_device_unrealize(DeviceState *dev)
{
VirtIODevice *vdev = VIRTIO_DEVICE(dev);
VHostUserFS *fs = VHOST_USER_FS(dev);
+ struct vhost_virtqueue *vhost_vqs = fs->vhost_dev.vqs;
int i;
/* This will stop vhost backend if appropriate. */
@@ -288,8 +289,7 @@ static void vuf_device_unrealize(DeviceState *dev)
}
g_free(fs->req_vqs);
virtio_cleanup(vdev);
- g_free(fs->vhost_dev.vqs);
- fs->vhost_dev.vqs = NULL;
+ g_free(vhost_vqs);
}
static struct vhost_dev *vuf_get_vhost(VirtIODevice *vdev)
--
2.39.1
- [PULL 0/6] Block patches, Stefan Hajnoczi, 2023/02/09
- [PULL 1/6] vhost-user-fs: Back up vqs before cleaning up vhost_dev,
Stefan Hajnoczi <=
- [PULL 2/6] virtio-blk: add missing AioContext lock, Stefan Hajnoczi, 2023/02/09
- [PULL 3/6] block: fix detect-zeroes= with BDRV_REQ_REGISTERED_BUF, Stefan Hajnoczi, 2023/02/09
- [PULL 4/6] qemu-io: use BdrvRequestFlags instead of int, Stefan Hajnoczi, 2023/02/09
- [PULL 5/6] qemu-io: add -r option to register I/O buffer, Stefan Hajnoczi, 2023/02/09
- [PULL 6/6] iotests/detect-zeroes-registered-buf: add new test, Stefan Hajnoczi, 2023/02/09
- Re: [PULL 0/6] Block patches, Peter Maydell, 2023/02/10