diff mbox series

[v2,2/2] chardev: build spice chardevs as module

Message ID 20200916083913.11902-3-kraxel@redhat.com
State New
Headers show
Series build spice chardevs as module | expand

Commit Message

Gerd Hoffmann Sept. 16, 2020, 8:39 a.m. UTC
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 util/module.c       | 2 ++
 chardev/meson.build | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

Comments

Paolo Bonzini Sept. 16, 2020, 9:22 a.m. UTC | #1
On 16/09/20 10:39, Gerd Hoffmann wrote:
> +if config_host.has_key('CONFIG_SPICE')
> +  module_ss = ss.source_set()
> +  module_ss.add(when: [spice], if_true: [files('spice.c'), spice])

You don't need to have "spice" listed in both sides.  It is not needed
in "when" because you are effectively inside an "if spice.found()" that
is written in a weird way; and it is not needed in "if_true" if it is
listed in "when".

So it can be either

  module_ss.add(files('spice.c'), spice)

or

  module_ss.add(when: spice, if_true: files('spice.c'))

Thanks,

Paolo


> +  chardev_modules += { 'spice': module_ss }
> +endif
> +
diff mbox series

Patch

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..a16ea8ab7c24 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'), spice])
+  chardev_modules += { 'spice': module_ss }
+endif
+
 modules += { 'chardev': chardev_modules }