[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 6/6] chardev/spice: build spice chardevs as module
From: |
Gerd Hoffmann |
Subject: |
[PATCH v4 6/6] chardev/spice: build spice chardevs as module |
Date: |
Wed, 30 Sep 2020 13:29:04 +0200 |
Signed-off-by: Gerd Hoffmann <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 34772e7d87eb..86781c207f7d 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 54e88d031004..85f3464d2971 100644
--- a/chardev/meson.build
+++ b/chardev/meson.build
@@ -32,7 +32,6 @@ libchardev = static_library('chardev', chardev_ss.sources() +
genh,
chardev = declare_dependency(link_whole: libchardev)
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 = {}
@@ -42,4 +41,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
- [PATCH v4 0/6] build spice chardevs as module, Gerd Hoffmann, 2020/09/30
- [PATCH v4 1/6] ui/spice-app: don't use qemu_chr_open_spice_port directly, Gerd Hoffmann, 2020/09/30
- [PATCH v4 2/6] chardev/spice: make qemu_chr_open_spice_port static, Gerd Hoffmann, 2020/09/30
- [PATCH v4 6/6] chardev/spice: build spice chardevs as module,
Gerd Hoffmann <=
- [PATCH v4 3/6] chardev/spice: simplify chardev setup, Gerd Hoffmann, 2020/09/30
- [PATCH v4 4/6] meson: add spice_headers dependency., Gerd Hoffmann, 2020/09/30
- [PATCH v4 5/6] meson: add spice dependency to core spice source files., Gerd Hoffmann, 2020/09/30