From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Laurent Vivier" <lvivier@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Thomas Huth" <thuth@redhat.com>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>
Subject: [PULL 8/8] chardev/spice: build spice chardevs as module
Date: Thu, 15 Oct 2020 14:53:22 +0200 [thread overview]
Message-ID: <20201015125322.23648-9-kraxel@redhat.com> (raw)
In-Reply-To: <20201015125322.23648-1-kraxel@redhat.com>
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
next prev parent reply other threads:[~2020-10-15 12:57 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-15 12:53 [PULL 0/8] Modules 20201015 patches Gerd Hoffmann
2020-10-15 12:53 ` [PULL 1/8] module: silence errors for module_load_qom_all() Gerd Hoffmann
2020-10-15 12:53 ` [PULL 2/8] modules: update qom object module comment Gerd Hoffmann
2020-10-15 12:53 ` [PULL 3/8] ui/spice-app: don't use qemu_chr_open_spice_port directly Gerd Hoffmann
2020-10-15 12:53 ` [PULL 4/8] chardev/spice: make qemu_chr_open_spice_port static Gerd Hoffmann
2020-10-15 12:53 ` [PULL 5/8] chardev/spice: simplify chardev setup Gerd Hoffmann
2020-10-15 12:53 ` [PULL 6/8] meson: add spice_headers dependency Gerd Hoffmann
2020-10-15 12:53 ` [PULL 7/8] meson: add spice dependency to core spice source files Gerd Hoffmann
2020-10-15 12:53 ` Gerd Hoffmann [this message]
2020-10-16 16:38 ` [PULL 0/8] Modules 20201015 patches Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201015125322.23648-9-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=lvivier@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).