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 /include | |
| 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 'include')
| -rw-r--r-- | include/chardev/spice.h | 4 | ||||
| -rw-r--r-- | include/qemu/module.h | 8 | ||||
| -rw-r--r-- | include/ui/qemu-spice.h | 1 |
3 files changed, 4 insertions, 9 deletions
diff --git a/include/chardev/spice.h b/include/chardev/spice.h index 99f26aedde..58e5b727e9 100644 --- a/include/chardev/spice.h +++ b/include/chardev/spice.h @@ -13,7 +13,6 @@ struct SpiceChardev { bool blocked; const uint8_t *datapos; int datalen; - QLIST_ENTRY(SpiceChardev) next; }; typedef struct SpiceChardev SpiceChardev; @@ -24,7 +23,4 @@ typedef struct SpiceChardev SpiceChardev; DECLARE_INSTANCE_CHECKER(SpiceChardev, SPICE_CHARDEV, TYPE_CHARDEV_SPICE) -void qemu_chr_open_spice_port(Chardev *chr, ChardevBackend *backend, - bool *be_opened, Error **errp); - #endif diff --git a/include/qemu/module.h b/include/qemu/module.h index 9121a475c1..944d403cbd 100644 --- a/include/qemu/module.h +++ b/include/qemu/module.h @@ -61,15 +61,15 @@ typedef enum { #define fuzz_target_init(function) module_init(function, \ MODULE_INIT_FUZZ_TARGET) #define migration_init(function) module_init(function, MODULE_INIT_MIGRATION) -#define block_module_load_one(lib) module_load_one("block-", lib) -#define ui_module_load_one(lib) module_load_one("ui-", lib) -#define audio_module_load_one(lib) module_load_one("audio-", lib) +#define block_module_load_one(lib) module_load_one("block-", lib, false) +#define ui_module_load_one(lib) module_load_one("ui-", lib, false) +#define audio_module_load_one(lib) module_load_one("audio-", lib, false) void register_module_init(void (*fn)(void), module_init_type type); void register_dso_module_init(void (*fn)(void), module_init_type type); void module_call_init(module_init_type type); -bool module_load_one(const char *prefix, const char *lib_name); +bool module_load_one(const char *prefix, const char *lib_name, bool mayfail); void module_load_qom_one(const char *type); void module_load_qom_all(void); diff --git a/include/ui/qemu-spice.h b/include/ui/qemu-spice.h index 12474d88f4..0e8ec3f0d7 100644 --- a/include/ui/qemu-spice.h +++ b/include/ui/qemu-spice.h @@ -45,7 +45,6 @@ int qemu_spice_migrate_info(const char *hostname, int port, int tls_port, #else #define SPICE_NEEDS_SET_MM_TIME 0 #endif -void qemu_spice_register_ports(void); #else /* CONFIG_SPICE */ |