meson: fix device module builds
v2 cover meson: fix device module builds
Gerd Hoffmann (6):
meson: fix qxl dependencies
meson: fix module config
meson: remove duplicate qxl sources
object_initialize: try module load
virtio-gpu: make virtio_gpu_ops static
virtio-gpu: build modular
include/hw/virtio/virtio-gpu.h | 3 +-- hw/display/virtio-gpu-base.c | 3 ++- hw/display/virtio-vga.c | 16 ++++++++-------- qom/object.c | 6 ++++++ util/module.c | 2 ++ hw/display/meson.build | 27 ++++++++------------------- meson.build | 2 +- 7 files changed, 28 insertions(+), 31 deletions(-)
Signature · 1 line
2.27.0
PATCH v2 1/6 meson: fix qxl dependencies
Add pixman and spice deps to qxl module.
--- hw/display/meson.build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
hw/display/meson.build +2 -1
@@ -41,7 +41,8 @@ specific_ss.add(when: 'CONFIG_VGA', if_true: files('vga.c')) if config_all_devices.has_key('CONFIG_QXL') qxl_ss = ss.source_set() - qxl_ss.add(when: 'CONFIG_QXL', if_true: files('qxl.c', 'qxl-logger.c', 'qxl-render.c')) + qxl_ss.add(when: 'CONFIG_QXL', if_true: [files('qxl.c', 'qxl-logger.c', 'qxl-render.c'), + pixman, spice]) hw_display_modules += {'qxl': qxl_ss} endif
Signature · 1 line
2.27.0
PATCH v2 2/6 meson: fix module config
In reply to Gerd HoffmannUse all config symbols not only the host ones. Needed to make sure device configs like CONFIG_QXL are used for modules too.
--- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meson.build +1 -1
@@ -913,7 +913,7 @@ softmmu_mods = [] foreach d, list : modules foreach m, module_ss : list if enable_modules and targetos != 'windows' - module_ss = module_ss.apply(config_host, strict: false) + module_ss = module_ss.apply(config_all, strict: false) sl = static_library(d + '-' + m, [genh, module_ss.sources()], dependencies: [modulecommon, module_ss.dependencies()], pic: true) if d == 'block'
Signature · 1 line
2.27.0
PATCH v2 3/6 meson: remove duplicate qxl sources
In reply to Gerd HoffmannWe should add sources to the softmmu_ss or module_ss but not both.
--- hw/display/meson.build | 2 -- 1 file changed, 2 deletions(-)
hw/display/meson.build +0 -2
@@ -46,8 +46,6 @@ if config_all_devices.has_key('CONFIG_QXL') hw_display_modules += {'qxl': qxl_ss} endif -softmmu_ss.add(when: 'CONFIG_QXL', if_true: files('qxl.c', 'qxl-logger.c', 'qxl-render.c')) - softmmu_ss.add(when: 'CONFIG_DPCD', if_true: files('dpcd.c')) softmmu_ss.add(when: 'CONFIG_XLNX_ZYNQMP_ARM', if_true: files('xlnx_dp.c'))
Signature · 1 line
2.27.0
PATCH v2 4/6 object_initialize: try module load
In reply to Gerd HoffmannNeeded to allow virtio-gpu-pci initialize the
virtio-gpu-device child device.
--- qom/object.c | 6 ++++++ 1 file changed, 6 insertions(+)
qom/object.c +6 -0
@@ -518,6 +518,12 @@ void object_initialize(void *data, size_t size, const char *typename) {TypeImpl *type =type_get_by_name (typename); +#ifdef CONFIG_MODULES +if (!type) { +module_load_qom_one (typename); + type =type_get_by_name (typename); + } +#endif if (!type) {error_report ("missing object type '%s'" , typename);abort ();
Signature · 1 line
2.27.0
PATCH v2 5/6 virtio-gpu: make virtio_gpu_ops static
In reply to Gerd HoffmannReference it via ops pointer instead, simliar to the vga one. Removes hard symbol reference, needed to build virtio-gpu modular.
--- 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(-)
include/hw/virtio/virtio-gpu.h +1 -2
@@ -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, \
hw/display/virtio-gpu-base.c +2 -1
@@ -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);
hw/display/virtio-vga.c +8 -8
@@ -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); } }
Signature · 1 line
2.27.0
PATCH v2 6/6 virtio-gpu: build modular
In reply to Gerd HoffmannOnly build virtio-gpu-device modular (the code which actually depends on the external virglrenderer library). virtio-gpu-pci and virtio-vga are compiled into core qemu still.
--- util/module.c | 2 ++ hw/display/meson.build | 22 ++++++---------------- 2 files changed, 8 insertions(+), 16 deletions(-)
util/module.c +2 -0
@@ -265,6 +265,8 @@ static struct { { "usb-redir", "hw-", "usb-redirect" }, { "qxl-vga", "hw-", "display-qxl" }, { "qxl", "hw-", "display-qxl" }, + { "virtio-gpu-device", "hw-", "display-virtio-gpu" }, + { "vhost-user-gpu", "hw-", "display-virtio-gpu" }, { "chardev-braille", "chardev-", "baum" }, };
hw/display/meson.build +6 -16
@@ -59,24 +59,14 @@ if config_all_devices.has_key('CONFIG_VIRTIO_GPU') virtio_gpu_ss.add(when: 'CONFIG_VIRTIO_GPU', if_true: [files('virtio-gpu-base.c', 'virtio-gpu.c', 'virtio-gpu-3d.c'), pixman, virgl]) virtio_gpu_ss.add(when: 'CONFIG_VHOST_USER_GPU', if_true: files('vhost-user-gpu.c')) - virtio_gpu_ss.add(when: ['CONFIG_VIRTIO_GPU', 'CONFIG_VIRTIO_PCI'], if_true: files('virtio-gpu-pci.c')) - virtio_gpu_ss.add(when: ['CONFIG_VHOST_USER_GPU', 'CONFIG_VIRTIO_PCI'], if_true: files('vhost-user-gpu-pci.c')) - virtio_gpu_ss.add(when: 'CONFIG_VIRTIO_VGA', if_true: files('virtio-vga.c')) - virtio_gpu_ss.add(when: 'CONFIG_VHOST_USER_VGA', if_true: files('vhost-user-vga.c')) - - # FIXME: this was attempted in the Makefile build system; it was then reverted - # as it would try to load all devices when the module is loaded, even if - # config_devices for this target only has some of them. Since virtio-gpu-pci - # and virtio-vga both instantiate a virtio-gpu-device, fixing it probably does - # not even require a dependency system, just splitting the module in three - # for CONFIG_VIRTIO_GPU/CONFIG_VHOST_USER_GPU, CONFIG_VIRTIO_PCI and - # CONFIG_VIRTIO_VGA/CONFIG_VHOST_USER_VGA. - # Sourcesets are a dime a dozen, so keep it and just disable module builds. - - #hw_display_modules += {'virtio-gpu': virtio_gpu_ss} - softmmu_ss.add_all(virtio_gpu_ss) + hw_display_modules += {'virtio-gpu': virtio_gpu_ss} endif +softmmu_ss.add(when: ['CONFIG_VIRTIO_GPU', 'CONFIG_VIRTIO_PCI'], if_true: files('virtio-gpu-pci.c')) +softmmu_ss.add(when: ['CONFIG_VHOST_USER_GPU', 'CONFIG_VIRTIO_PCI'], if_true: files('vhost-user-gpu-pci.c')) +softmmu_ss.add(when: 'CONFIG_VIRTIO_VGA', if_true: files('virtio-vga.c')) +softmmu_ss.add(when: 'CONFIG_VHOST_USER_VGA', if_true: files('vhost-user-vga.c')) + specific_ss.add(when: [x11, opengl, 'CONFIG_MILKYMIST_TMU2'], if_true: files('milkymist-tmu2.c')) specific_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_lcdc.c'))
Signature · 1 line
2.27.0