[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 8/8] chardev/spice: build spice chardevs as module
From: |
Gerd Hoffmann |
Subject: |
[PULL 8/8] chardev/spice: build spice chardevs as module |
Date: |
Thu, 15 Oct 2020 14:53:22 +0200 |
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 20201014121120.13482-8-kraxel@redhat.com
---
util/module.c | 2 ++
chardev/meson.build | 7 ++++++-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/util/module.c b/util/module.c
index 4349607ad176..f0ed05fbd06b 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;
diff --git a/chardev/meson.build b/chardev/meson.build
index dd2699a11b08..859d8b04d480 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 }
--
2.27.0
- [PULL 0/8] Modules 20201015 patches, Gerd Hoffmann, 2020/10/15
- [PULL 2/8] modules: update qom object module comment, Gerd Hoffmann, 2020/10/15
- [PULL 8/8] chardev/spice: build spice chardevs as module,
Gerd Hoffmann <=
- [PULL 3/8] ui/spice-app: don't use qemu_chr_open_spice_port directly, Gerd Hoffmann, 2020/10/15
- [PULL 1/8] module: silence errors for module_load_qom_all()., Gerd Hoffmann, 2020/10/15
- [PULL 5/8] chardev/spice: simplify chardev setup, Gerd Hoffmann, 2020/10/15
- [PULL 6/8] meson: add spice_headers dependency., Gerd Hoffmann, 2020/10/15
- [PULL 4/8] chardev/spice: make qemu_chr_open_spice_port static, Gerd Hoffmann, 2020/10/15
- [PULL 7/8] meson: add spice dependency to core spice source files., Gerd Hoffmann, 2020/10/15
- Re: [PULL 0/8] Modules 20201015 patches, Peter Maydell, 2020/10/16