diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-10-15 22:20:46 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-10-15 22:20:46 +0100 |
| commit | 6214addcc6b6bf6b444934833144bab10cbe6a1a (patch) | |
| tree | d3a67d95fcede1ef6c14ba6cb0f0624ad258ecc9 /monitor | |
| parent | 3e40748834923798aa57e3751db13a069e2c617b (diff) | |
| parent | 23ebeaae4eb09a0d92dc7f22b41e5dd08485c390 (diff) | |
Merge remote-tracking branch 'remotes/kraxel/tags/modules-20201015-pull-request' into staging
modules: misc fixes & tweaks.
modules: build spice chardevs as module.
# gpg: Signature made Thu 15 Oct 2020 13:53:03 BST
# gpg: using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/modules-20201015-pull-request:
chardev/spice: build spice chardevs as module
meson: add spice dependency to core spice source files.
meson: add spice_headers dependency.
chardev/spice: simplify chardev setup
chardev/spice: make qemu_chr_open_spice_port static
ui/spice-app: don't use qemu_chr_open_spice_port directly
modules: update qom object module comment
module: silence errors for module_load_qom_all().
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'monitor')
| -rw-r--r-- | monitor/meson.build | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/monitor/meson.build b/monitor/meson.build index eb2a534fdc..6d00985ace 100644 --- a/monitor/meson.build +++ b/monitor/meson.build @@ -3,7 +3,7 @@ qmp_ss.add(files('monitor.c', 'qmp.c', 'qmp-cmds-control.c')) softmmu_ss.add(files( 'hmp-cmds.c', 'hmp.c', - 'qmp-cmds.c', )) +softmmu_ss.add([spice_headers, files('qmp-cmds.c')]) specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: [files('misc.c'), spice]) |