Re: [PATCH 1/2] virtio-gpu: free BHs, by implementing unrealize
Acked-by: Dongwon Kim From: Marc-André Lureau
Signed-off-by: Marc-André Lureau
--- include/hw/virtio/virtio-gpu.h | 1 +
hw/display/virtio-gpu-base.c | 2 +- hw/display/virtio-gpu.c
| 10 ++ 3 files changed, 12 insertions(+), 1 deletion(-) diff
--git a/include/hw/virtio/virtio-gpu.h b/include/hw/virtio/virtio-gpu.h
index 7ea8ae2bee..05bee09e1a 100644 --- a/include/hw/virtio/virtio-gpu.h
+++ b/include/hw/virtio/virtio-gpu.h @@ -238,6 +238,7 @@ bool
virtio_gpu_base_device_realize(DeviceState *qdev,
VirtIOHandleOutput ctrl_cb,
VirtIOHandleOutput cursor_cb,
Error **errp); +void
virtio_gpu_base_device_unrealize(DeviceState *qdev); void
virtio_gpu_base_reset(VirtIOGPUBase *g); void
virtio_gpu_base_fill_display_info(VirtIOGPUBase *g,
struct virtio_gpu_resp_display_info
*dpy_info); diff --git a/hw/display/virtio-gpu-base.c
b/hw/display/virtio-gpu-base.c index 7ab7d08d0a..ca1fb7b16f 100644 ---
a/hw/display/virtio-gpu-base.c +++ b/hw/display/virtio-gpu-base.c @@
-244,7 +244,7 @@ virtio_gpu_base_set_features(VirtIODevice *vdev,
uint64_t features) trace_virtio_gpu_features(((features & virgl) ==
virgl)); } -static void +void
virtio_gpu_base_device_unrealize(DeviceState *qdev) {
VirtIOGPUBase *g = VIRTIO_GPU_BASE(qdev); diff --git
a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c index
e8603d78ca..b1f5d392bb 100644 --- a/hw/display/virtio-gpu.c +++
b/hw/display/virtio-gpu.c @@ -1392,6 +1392,15 @@ void
virtio_gpu_device_realize(DeviceState *qdev, Error **errp)
QTAILQ_INIT(&g->fenceq); } +static void
virtio_gpu_device_unrealize(DeviceState *qdev) +{ + VirtIOGPU *g =
VIRTIO_GPU(qdev); + + g_clear_pointer(&g->ctrl_bh, qemu_bh_delete);
+ g_clear_pointer(&g->cursor_bh, qemu_bh_delete); +
virtio_gpu_base_device_unrealize(qdev); +} + void
virtio_gpu_reset(VirtIODevice *vdev) { VirtIOGPU *g =
VIRTIO_GPU(vdev); @@ -1492,6 +1501,7 @@ static void
virtio_gpu_class_init(ObjectClass *klass, void *data)
vgbc->gl_flushed = virtio_gpu_handle_gl_flushed; vdc->realize =
virtio_gpu_device_realize; + vdc->unrealize =
virtio_gpu_device_unrealize; vdc->reset = virtio_gpu_reset;
vdc->get_config = virtio_gpu_get_config; vdc->set_config =
virtio_gpu_set_config; -- 2.41.0
[PATCH 1/2] virtio-gpu: free BHs, by implementing unrealize
From: Marc-André Lureau
Signed-off-by: Marc-André Lureau
---
include/hw/virtio/virtio-gpu.h | 1 +
hw/display/virtio-gpu-base.c | 2 +-
hw/display/virtio-gpu.c| 10 ++
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/include/hw/virtio/virtio-gpu.h b/include/hw/virtio/virtio-gpu.h
index 7ea8ae2bee..05bee09e1a 100644
--- a/include/hw/virtio/virtio-gpu.h
+++ b/include/hw/virtio/virtio-gpu.h
@@ -238,6 +238,7 @@ bool virtio_gpu_base_device_realize(DeviceState *qdev,
VirtIOHandleOutput ctrl_cb,
VirtIOHandleOutput cursor_cb,
Error **errp);
+void virtio_gpu_base_device_unrealize(DeviceState *qdev);
void virtio_gpu_base_reset(VirtIOGPUBase *g);
void virtio_gpu_base_fill_display_info(VirtIOGPUBase *g,
struct virtio_gpu_resp_display_info *dpy_info);
diff --git a/hw/display/virtio-gpu-base.c b/hw/display/virtio-gpu-base.c
index 7ab7d08d0a..ca1fb7b16f 100644
--- a/hw/display/virtio-gpu-base.c
+++ b/hw/display/virtio-gpu-base.c
@@ -244,7 +244,7 @@ virtio_gpu_base_set_features(VirtIODevice *vdev, uint64_t
features)
trace_virtio_gpu_features(((features & virgl) == virgl));
}
-static void
+void
virtio_gpu_base_device_unrealize(DeviceState *qdev)
{
VirtIOGPUBase *g = VIRTIO_GPU_BASE(qdev);
diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c
index e8603d78ca..b1f5d392bb 100644
--- a/hw/display/virtio-gpu.c
+++ b/hw/display/virtio-gpu.c
@@ -1392,6 +1392,15 @@ void virtio_gpu_device_realize(DeviceState *qdev, Error
**errp)
QTAILQ_INIT(&g->fenceq);
}
+static void virtio_gpu_device_unrealize(DeviceState *qdev)
+{
+VirtIOGPU *g = VIRTIO_GPU(qdev);
+
+g_clear_pointer(&g->ctrl_bh, qemu_bh_delete);
+g_clear_pointer(&g->cursor_bh, qemu_bh_delete);
+virtio_gpu_base_device_unrealize(qdev);
+}
+
void virtio_gpu_reset(VirtIODevice *vdev)
{
VirtIOGPU *g = VIRTIO_GPU(vdev);
@@ -1492,6 +1501,7 @@ static void virtio_gpu_class_init(ObjectClass *klass,
void *data)
vgbc->gl_flushed = virtio_gpu_handle_gl_flushed;
vdc->realize = virtio_gpu_device_realize;
+vdc->unrealize = virtio_gpu_device_unrealize;
vdc->reset = virtio_gpu_reset;
vdc->get_config = virtio_gpu_get_config;
vdc->set_config = virtio_gpu_set_config;
--
2.41.0
