[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 5/6] virtio-gpu: make virtio_gpu_ops static
From: |
Gerd Hoffmann |
Subject: |
[PATCH v2 5/6] virtio-gpu: make virtio_gpu_ops static |
Date: |
Mon, 14 Sep 2020 15:42:23 +0200 |
Reference it via ops pointer instead, simliar to the vga one.
Removes hard symbol reference, needed to build virtio-gpu modular.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
include/hw/virtio/virtio-gpu.h | 3 +--
hw/display/virtio-gpu-base.c | 3 ++-
hw/display/virtio-vga.c | 16 ++++++++--------
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/include/hw/virtio/virtio-gpu.h b/include/hw/virtio/virtio-gpu.h
index f334b780858c..6b45b4799a3e 100644
--- a/include/hw/virtio/virtio-gpu.h
+++ b/include/hw/virtio/virtio-gpu.h
@@ -106,6 +106,7 @@ struct VirtIOGPUBase {
struct virtio_gpu_base_conf conf;
struct virtio_gpu_config virtio_config;
+ const GraphicHwOps *hw_ops;
bool use_virgl_renderer;
int renderer_blocked;
@@ -171,8 +172,6 @@ struct VhostUserGPU {
bool backend_blocked;
};
-extern const GraphicHwOps virtio_gpu_ops;
-
#define VIRTIO_GPU_FILL_CMD(out) do { \
size_t s; \
s = iov_to_buf(cmd->elem.out_sg, cmd->elem.out_num, 0, \
diff --git a/hw/display/virtio-gpu-base.c b/hw/display/virtio-gpu-base.c
index 796130860657..aeb87235420a 100644
--- a/hw/display/virtio-gpu-base.c
+++ b/hw/display/virtio-gpu-base.c
@@ -112,7 +112,7 @@ virtio_gpu_gl_block(void *opaque, bool block)
}
}
-const GraphicHwOps virtio_gpu_ops = {
+static const GraphicHwOps virtio_gpu_ops = {
.invalidate = virtio_gpu_invalidate_display,
.gfx_update = virtio_gpu_update_display,
.text_update = virtio_gpu_text_update,
@@ -162,6 +162,7 @@ virtio_gpu_base_device_realize(DeviceState *qdev,
g->req_state[0].width = g->conf.xres;
g->req_state[0].height = g->conf.yres;
+ g->hw_ops = &virtio_gpu_ops;
for (i = 0; i < g->conf.max_outputs; i++) {
g->scanout[i].con =
graphic_console_init(DEVICE(g), i, &virtio_gpu_ops, g);
diff --git a/hw/display/virtio-vga.c b/hw/display/virtio-vga.c
index 573e7d59282a..f9410a0c2e61 100644
--- a/hw/display/virtio-vga.c
+++ b/hw/display/virtio-vga.c
@@ -13,7 +13,7 @@ static void virtio_vga_base_invalidate_display(void *opaque)
VirtIOGPUBase *g = vvga->vgpu;
if (g->enable) {
- virtio_gpu_ops.invalidate(g);
+ g->hw_ops->invalidate(g);
} else {
vvga->vga.hw_ops->invalidate(&vvga->vga);
}
@@ -25,7 +25,7 @@ static void virtio_vga_base_update_display(void *opaque)
VirtIOGPUBase *g = vvga->vgpu;
if (g->enable) {
- virtio_gpu_ops.gfx_update(g);
+ g->hw_ops->gfx_update(g);
} else {
vvga->vga.hw_ops->gfx_update(&vvga->vga);
}
@@ -37,8 +37,8 @@ static void virtio_vga_base_text_update(void *opaque,
console_ch_t *chardata)
VirtIOGPUBase *g = vvga->vgpu;
if (g->enable) {
- if (virtio_gpu_ops.text_update) {
- virtio_gpu_ops.text_update(g, chardata);
+ if (g->hw_ops->text_update) {
+ g->hw_ops->text_update(g, chardata);
}
} else {
if (vvga->vga.hw_ops->text_update) {
@@ -52,8 +52,8 @@ static int virtio_vga_base_ui_info(void *opaque, uint32_t
idx, QemuUIInfo *info)
VirtIOVGABase *vvga = opaque;
VirtIOGPUBase *g = vvga->vgpu;
- if (virtio_gpu_ops.ui_info) {
- return virtio_gpu_ops.ui_info(g, idx, info);
+ if (g->hw_ops->ui_info) {
+ return g->hw_ops->ui_info(g, idx, info);
}
return -1;
}
@@ -63,8 +63,8 @@ static void virtio_vga_base_gl_block(void *opaque, bool block)
VirtIOVGABase *vvga = opaque;
VirtIOGPUBase *g = vvga->vgpu;
- if (virtio_gpu_ops.gl_block) {
- virtio_gpu_ops.gl_block(g, block);
+ if (g->hw_ops->gl_block) {
+ g->hw_ops->gl_block(g, block);
}
}
--
2.27.0
- [PATCH v2 0/6] meson: fix device module builds, Gerd Hoffmann, 2020/09/14
- [PATCH v2 2/6] meson: fix module config, Gerd Hoffmann, 2020/09/14
- [PATCH v2 6/6] virtio-gpu: build modular, Gerd Hoffmann, 2020/09/14
- [PATCH v2 3/6] meson: remove duplicate qxl sources, Gerd Hoffmann, 2020/09/14
- [PATCH v2 1/6] meson: fix qxl dependencies, Gerd Hoffmann, 2020/09/14
- [PATCH v2 4/6] object_initialize: try module load, Gerd Hoffmann, 2020/09/14
- [PATCH v2 5/6] virtio-gpu: make virtio_gpu_ops static,
Gerd Hoffmann <=