From 23ebeaae4eb09a0d92dc7f22b41e5dd08485c390 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Wed, 14 Oct 2020 14:11:20 +0200 Subject: [PATCH] chardev/spice: build spice chardevs as module Signed-off-by: Gerd Hoffmann Message-id: 20201014121120.13482-8-kraxel@redhat.com --- chardev/meson.build | 7 ++++++- util/module.c | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/chardev/meson.build b/chardev/meson.build index dd2699a11b..859d8b04d4 100644 --- a/chardev/meson.build +++ b/chardev/meson.build @@ -26,7 +26,6 @@ chardev_ss.add(when: 'CONFIG_WIN32', if_true: files( chardev_ss = chardev_ss.apply(config_host, strict: false) softmmu_ss.add(files('chardev-sysemu.c', 'msmouse.c', 'wctablet.c', 'testdev.c')) -softmmu_ss.add(when: ['CONFIG_SPICE', spice], if_true: files('spice.c')) chardev_modules = {} @@ -36,4 +35,10 @@ if config_host.has_key('CONFIG_BRLAPI') chardev_modules += { 'baum': module_ss } endif +if config_host.has_key('CONFIG_SPICE') + module_ss = ss.source_set() + module_ss.add(when: [spice], if_true: files('spice.c')) + chardev_modules += { 'spice': module_ss } +endif + modules += { 'chardev': chardev_modules } diff --git a/util/module.c b/util/module.c index 4349607ad1..f0ed05fbd0 100644 --- a/util/module.c +++ b/util/module.c @@ -268,6 +268,8 @@ static struct { { "virtio-gpu-device", "hw-", "display-virtio-gpu" }, { "vhost-user-gpu", "hw-", "display-virtio-gpu" }, { "chardev-braille", "chardev-", "baum" }, + { "chardev-spicevmc", "chardev-", "spice" }, + { "chardev-spiceport", "chardev-", "spice" }, }; static bool module_loaded_qom_all;