From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Paolo Bonzini" <pbonzini@redhat.com>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Daniel P. Berrangé" <berrange@redhat.com>,
"Eduardo Habkost" <ehabkost@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>
Subject: [PULL 5/6] virtio-gpu: make virtio_gpu_ops static
Date: Tue, 15 Sep 2020 15:09:07 +0200 [thread overview]
Message-ID: <20200915130908.12808-6-kraxel@redhat.com> (raw)
In-Reply-To: <20200915130908.12808-1-kraxel@redhat.com>
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>
Message-id: 20200914134224.29769-6-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
next prev parent reply other threads:[~2020-09-15 13:24 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-15 13:09 [PULL 0/6] Vga 20200915 patches Gerd Hoffmann
2020-09-15 13:09 ` [PULL 1/6] meson: fix qxl dependencies Gerd Hoffmann
2020-09-15 13:09 ` [PULL 2/6] meson: fix module config Gerd Hoffmann
2020-09-15 13:09 ` [PULL 3/6] meson: remove duplicate qxl sources Gerd Hoffmann
2020-09-15 13:09 ` [PULL 4/6] object_initialize: try module load Gerd Hoffmann
2020-09-15 13:09 ` Gerd Hoffmann [this message]
2020-09-15 13:09 ` [PULL 6/6] virtio-gpu: build modular Gerd Hoffmann
2020-09-15 16:00 ` [PULL 0/6] Vga 20200915 patches Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200915130908.12808-6-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=berrange@redhat.com \
--cc=ehabkost@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.