build spice chardevs as module
v3 cover build spice chardevs as module
v3:
- fix spice-app
- init objects before spice
- meson cleanup
Gerd Hoffmann (4):
ui/spice-app: don't use qemu_chr_open_spice_port directly chardev/spice: make qemu_chr_open_spice_port static chardev/spice: simplify chardev setup chardev/spice: build spice chardevs as module
include/chardev/spice.h | 4 ---- include/ui/qemu-spice.h | 1 - chardev/spice.c | 37 ++++++++++--------------------------- softmmu/vl.c | 9 +++++---- ui/spice-app.c | 34 ++++++++++++++++++++++------------ ui/spice-core.c | 2 -- util/module.c | 2 ++ chardev/meson.build | 7 ++++++- 8 files changed, 45 insertions(+), 51 deletions(-)
Signature · 1 line
2.27.0
PATCH v3 1/4 ui/spice-app: don't use qemu_chr_open_spice_port directly
Save the parent object's open function pointer in the (new) VCChardevClass struct instead before overwriting it, so we can look it up when needed.
--- ui/spice-app.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-)
ui/spice-app.c +13 -4
@@ -44,11 +44,15 @@ static char *sock_path;struct VCChardev {SpiceChardev parent; }; -typedef struct VCChardev VCChardev ; + +struct VCChardevClass { +ChardevClass parent; +void (*parent_open)(Chardev *chr,ChardevBackend *backend, +bool *be_opened,Error **errp); +};#define TYPE_CHARDEV_VC "chardev-vc" -DECLARE_INSTANCE_CHECKER (VCChardev,VC_CHARDEV , - TYPE_CHARDEV_VC) +OBJECT_DECLARE_TYPE(VCChardev, VCChardevClass, chardev_vc, CHARDEV_VC)static ChardevBackend *chr_spice_backend_new (void )
@@ -66,6 +70,7 @@ static void vc_chr_open(Chardev *chr,bool *be_opened, Error **errp) { + VCChardevClass *vc = CHARDEV_VC_GET_CLASS(chr);ChardevBackend *be;const char *fqdn =NULL ;
@@ -80,7 +85,7 @@ static void vc_chr_open(Chardev *chr, be =chr_spice_backend_new (); be->u.spiceport.data->fqdn = fqdn ?g_strdup (fqdn) :g_strdup_printf ("org.qemu.console.%s" , chr->label); -qemu_chr_open_spice_port (chr, be, be_opened, errp); + vc->parent_open (chr, be, be_opened, errp);qapi_free_ChardevBackend (be); }
@@ -91,8 +96,11 @@ static void vc_chr_set_echo(Chardev *chr, bool echo)static void char_vc_class_init (ObjectClass *oc,void *data) { +VCChardevClass *vc =CHARDEV_VC_CLASS (oc);ChardevClass *cc =CHARDEV_CLASS (oc); + vc->parent_open = cc->open; + cc->parse = qemu_chr_parse_vc; cc->open = vc_chr_open; cc->chr_set_echo = vc_chr_set_echo;
@@ -103,6 +111,7 @@ static const TypeInfo char_vc_type_info = { .parent = TYPE_CHARDEV_SPICEPORT, .instance_size = sizeof(VCChardev), .class_init = char_vc_class_init, + .class_size = sizeof(VCChardevClass), };static void spice_app_atexit (void )
Signature · 1 line
2.27.0
Re: [PATCH v3 1/4] ui/spice-app: don't use qemu_chr_open_spice_port directly
Quoted 8 lines · Gerd Hoffmann
Save the parent object's open function pointer in the (new) VCChardevClass struct instead before overwriting it, so we can look it up when needed.
Signed-off-by Gerd Hoffmann <[email protected]>--- ui/spice-app.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-)
PATCH v3 2/4 chardev/spice: make qemu_chr_open_spice_port static
In reply to Gerd Hoffmann--- include/chardev/spice.h | 3 --- chardev/spice.c | 8 ++++---- 2 files changed, 4 insertions(+), 7 deletions(-)
include/chardev/spice.h +0 -3
@@ -24,7 +24,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
chardev/spice.c +4 -4
@@ -296,10 +296,10 @@ static void qemu_chr_open_spice_vmc(Chardev *chr,chr_open (chr, type); } -void qemu_chr_open_spice_port (Chardev *chr, -ChardevBackend *backend, -bool *be_opened, -Error **errp) +static void qemu_chr_open_spice_port (Chardev *chr, +ChardevBackend *backend, +bool *be_opened, +Error **errp) {ChardevSpicePort *spiceport = backend->u.spiceport.data;const char *name = spiceport->fqdn;
Signature · 1 line
2.27.0
Re: [PATCH v3 2/4] chardev/spice: make qemu_chr_open_spice_port static
Quoted 6 lines · Gerd Hoffmann
Signed-off-by Gerd Hoffmann <[email protected]>--- include/chardev/spice.h | 3 --- chardev/spice.c | 8 ++++---- 2 files changed, 4 insertions(+), 7 deletions(-)
PATCH v3 3/4 chardev/spice: simplify chardev setup
In reply to Gerd HoffmannInitialize spice before chardevs. That allows to register the spice chardevs directly in the init function and removes the need to maintain a linked list of chardevs just for registration.
--- include/chardev/spice.h | 1 - include/ui/qemu-spice.h | 1 - chardev/spice.c | 29 ++++++----------------------- softmmu/vl.c | 9 +++++---- ui/spice-app.c | 17 +++++++++-------- ui/spice-core.c | 2 -- 6 files changed, 20 insertions(+), 39 deletions(-)
include/chardev/spice.h +0 -1
@@ -13,7 +13,6 @@ struct SpiceChardev {bool blocked;const uint8_t *datapos;int datalen; -QLIST_ENTRY (SpiceChardev) next; };typedef struct SpiceChardev SpiceChardev ;
include/ui/qemu-spice.h +0 -1
@@ -46,7 +46,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 */
chardev/spice.c +6 -23
@@ -14,9 +14,6 @@ typedef struct SpiceCharSource {SpiceChardev *scd; } SpiceCharSource; -static QLIST_HEAD(, SpiceChardev) spice_chars = -QLIST_HEAD_INITIALIZER (spice_chars); -static int vmc_write (SpiceCharDeviceInstance *sin,const uint8_t *buf,int len) {SpiceChardev *scd =container_of (sin, SpiceChardev, sin);
@@ -216,8 +213,6 @@ static void char_spice_finalize(Object *obj)vmc_unregister_interface (s); -QLIST_SAFE_REMOVE (s, next); -g_free ((char *)s->sin.subtype);g_free ((char *)s->sin.portname); }
@@ -256,8 +251,6 @@ static void chr_open(Chardev *chr, const char *subtype) s->active = false; s->sin.subtype =g_strdup (subtype); - -QLIST_INSERT_HEAD (&spice_chars, s, next); } static void qemu_chr_open_spice_vmc(Chardev *chr,
@@ -310,28 +303,18 @@ static void qemu_chr_open_spice_port(Chardev *chr,return ; } +if (!using_spice) { +error_setg (errp,"spice not enabled" ); +return ; + } +chr_open (chr,"port" ); *be_opened = false; s =SPICE_CHARDEV (chr); s->sin.portname =g_strdup (name); -if (using_spice) { -/* spice server already created */ -vmc_register_interface (s); - } -} - -void qemu_spice_register_ports (void ) -{ -SpiceChardev *s; - - QLIST_FOREACH(s, &spice_chars, next) { -if (s->sin.portname ==NULL ) { -continue ; - } -vmc_register_interface (s); - } +vmc_register_interface (s); } static void qemu_chr_parse_spice_vmc(QemuOpts *opts, ChardevBackend *backend,
softmmu/vl.c +5 -4
@@ -4125,6 +4125,11 @@ void qemu_init(int argc, char **argv, char **envp) user_creatable_add_opts_foreach, object_create_initial, &error_fatal); +/* spice needs the timers to be initialized by this point */ +/* spice must initialize before audio as it changes the default auiodev */ +/* spice must initialize before chardevs (for spicevmc and spiceport) */ +qemu_spice_init (); +qemu_opts_foreach (qemu_find_opts ("chardev" ), chardev_init_func,NULL , &error_fatal);
@@ -4133,10 +4138,6 @@ void qemu_init(int argc, char **argv, char **envp) fsdev_init_func, NULL, &error_fatal);#endif -/* spice needs the timers to be initialized by this point */ -/* spice must initialize before audio as it changes the default auiodev */ -qemu_spice_init (); -/* * Note: we need to create audio and block backends before * machine_set_property(), so machine properties can refer to
ui/spice-app.c +9 -8
@@ -129,7 +129,6 @@ static void spice_app_atexit(void)static void spice_app_display_early_init (DisplayOptions *opts) {QemuOpts *qopts; -ChardevBackend *be =chr_spice_backend_new ();GError *err =NULL ;if (opts->has_full_screen) {
@@ -174,6 +173,15 @@ static void spice_app_display_early_init(DisplayOptions *opts)qemu_opt_set (qopts,"gl" , opts->has_gl ?"on" :"off" , &error_abort); display_opengl = opts->has_gl;#endif +} + +static void spice_app_display_init (DisplayState *ds,DisplayOptions *opts) +{ +ChardevBackend *be =chr_spice_backend_new (); +QemuOpts *qopts; +GError *err =NULL ; +gchar *uri; + be->u.spiceport.data->fqdn =g_strdup ("org.qemu.monitor.qmp.0" );qemu_chardev_new ("org.qemu.monitor.qmp" ,TYPE_CHARDEV_SPICEPORT , be,NULL , &error_abort);
@@ -183,13 +191,6 @@ static void spice_app_display_early_init(DisplayOptions *opts)qemu_opt_set (qopts,"mode" ,"control" , &error_abort);qapi_free_ChardevBackend (be); -} - -static void spice_app_display_init (DisplayState *ds,DisplayOptions *opts) -{ -GError *err =NULL ; -gchar *uri; - uri =g_strjoin ("" ,"spice+unix://" , app_dir,"/" ,"spice.sock" ,NULL );info_report ("Launching display with URI: %s" , uri);g_app_info_launch_default_for_uri (uri,NULL , &err);
ui/spice-core.c +0 -2
@@ -813,8 +813,6 @@ void qemu_spice_init(void)g_free (x509_cert_file);g_free (x509_cacert_file); -qemu_spice_register_ports (); -#ifdef HAVE_SPICE_GL if (qemu_opt_get_bool (opts,"gl" ,0 )) {if ((port !=0 ) || (tls_port !=0 )) {
Signature · 1 line
2.27.0
PATCH v3 4/4 chardev/spice: build spice chardevs as module
In reply to Gerd Hoffmann--- util/module.c | 2 ++ chardev/meson.build | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-)
util/module.c +2 -0
@@ -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;
chardev/meson.build +6 -1
@@ -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 }
Signature · 1 line
2.27.0
Patchew URL: https://patchew.org/QEMU/[email protected]/
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series failed build test on FreeBSD host. Please find the details below.
The full log is available at
http://patchew.org/logs/[email protected]/testing.FreeBSD/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to [email protected]