Build virtio-gpu vga devices modular.  Must be a separate module because
not all qemu softmmu variants come with VGA support.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 util/module.c          |  3 +++
 hw/display/meson.build | 10 ++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/util/module.c b/util/module.c
index 9490f975d303..503c399421c5 100644
--- a/util/module.c
+++ b/util/module.c
@@ -304,6 +304,9 @@ static struct {
     { "virtio-gpu-pci-base",   "hw-", "display-virtio-gpu-pci" },
     { "virtio-gpu-pci",        "hw-", "display-virtio-gpu-pci" },
     { "vhost-user-gpu-pci",    "hw-", "display-virtio-gpu-pci" },
+    { "virtio-vga-base",       "hw-", "display-virtio-vga"    },
+    { "virtio-vga",            "hw-", "display-virtio-vga"    },
+    { "vhost-user-vga",        "hw-", "display-virtio-vga"    },
     { "chardev-braille",       "chardev-", "baum"             },
     { "chardev-spicevmc",      "chardev-", "spice"            },
     { "chardev-spiceport",     "chardev-", "spice"            },
diff --git a/hw/display/meson.build b/hw/display/meson.build
index 669935371335..11ea2895c5fe 100644
--- a/hw/display/meson.build
+++ b/hw/display/meson.build
@@ -71,8 +71,14 @@ if config_all_devices.has_key('CONFIG_VIRTIO_PCI')
   hw_display_modules += {'virtio-gpu-pci': virtio_gpu_pci_ss}
 endif
 
-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'))
+if config_all_devices.has_key('CONFIG_VIRTIO_VGA')
+  virtio_vga_ss = ss.source_set()
+  virtio_vga_ss.add(when: 'CONFIG_VIRTIO_VGA',
+                    if_true: [files('virtio-vga.c'), pixman])
+  virtio_vga_ss.add(when: 'CONFIG_VHOST_USER_VGA',
+                    if_true: files('vhost-user-vga.c'))
+  hw_display_modules += {'virtio-vga': virtio_vga_ss}
+endif
 
 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'))
-- 
2.27.0

On Fri, Oct 23, 2020 at 10:48 AM Gerd Hoffmann <kraxel@redhat.com> wrote:

> Build virtio-gpu vga devices modular.  Must be a separate module because
> not all qemu softmmu variants come with VGA support.
>
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
>

Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>

---
>  util/module.c          |  3 +++
>  hw/display/meson.build | 10 ++++++++--
>  2 files changed, 11 insertions(+), 2 deletions(-)
>
> diff --git a/util/module.c b/util/module.c
> index 9490f975d303..503c399421c5 100644
> --- a/util/module.c
> +++ b/util/module.c
> @@ -304,6 +304,9 @@ static struct {
>      { "virtio-gpu-pci-base",   "hw-", "display-virtio-gpu-pci" },
>      { "virtio-gpu-pci",        "hw-", "display-virtio-gpu-pci" },
>      { "vhost-user-gpu-pci",    "hw-", "display-virtio-gpu-pci" },
> +    { "virtio-vga-base",       "hw-", "display-virtio-vga"    },
> +    { "virtio-vga",            "hw-", "display-virtio-vga"    },
> +    { "vhost-user-vga",        "hw-", "display-virtio-vga"    },
>      { "chardev-braille",       "chardev-", "baum"             },
>      { "chardev-spicevmc",      "chardev-", "spice"            },
>      { "chardev-spiceport",     "chardev-", "spice"            },
> diff --git a/hw/display/meson.build b/hw/display/meson.build
> index 669935371335..11ea2895c5fe 100644
> --- a/hw/display/meson.build
> +++ b/hw/display/meson.build
> @@ -71,8 +71,14 @@ if config_all_devices.has_key('CONFIG_VIRTIO_PCI')
>    hw_display_modules += {'virtio-gpu-pci': virtio_gpu_pci_ss}
>  endif
>
> -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'))
> +if config_all_devices.has_key('CONFIG_VIRTIO_VGA')
> +  virtio_vga_ss = ss.source_set()
> +  virtio_vga_ss.add(when: 'CONFIG_VIRTIO_VGA',
> +                    if_true: [files('virtio-vga.c'), pixman])
> +  virtio_vga_ss.add(when: 'CONFIG_VHOST_USER_VGA',
> +                    if_true: files('vhost-user-vga.c'))
> +  hw_display_modules += {'virtio-vga': virtio_vga_ss}
> +endif
>
>  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'))
> --
> 2.27.0
>
>
>

-- 
Marc-André Lureau