spice: simplify chardev setup
diff mbox series

Message ID 20200722084935.9601-1-kraxel@redhat.com
State New
Headers show
Series
  • spice: simplify chardev setup
Related show

Commit Message

Gerd Hoffmann July 22, 2020, 8:49 a.m. UTC
Initialize 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.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 include/chardev/spice.h |  1 -
 include/ui/qemu-spice.h |  1 -
 chardev/spice.c         | 29 ++++++-----------------------
 softmmu/vl.c            |  9 +++++----
 ui/spice-core.c         |  2 --
 5 files changed, 11 insertions(+), 31 deletions(-)

Comments

Christophe de Dinechin July 22, 2020, 9:20 a.m. UTC | #1
On 2020-07-22 at 10:49 CEST, Gerd Hoffmann wrote...
> Initialize 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.
>
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

Looks good to me, but I still need to test how this integrates with my work
on putting SPICE in a module.

Reviewed-by: Christophe de Dinechin <dinechin@redhat.com>

> ---
>  include/chardev/spice.h |  1 -
>  include/ui/qemu-spice.h |  1 -
>  chardev/spice.c         | 29 ++++++-----------------------
>  softmmu/vl.c            |  9 +++++----
>  ui/spice-core.c         |  2 --
>  5 files changed, 11 insertions(+), 31 deletions(-)
>
> diff --git a/include/chardev/spice.h b/include/chardev/spice.h
> index 1f7339b649dc..2013255f34fd 100644
> --- a/include/chardev/spice.h
> +++ b/include/chardev/spice.h
> @@ -12,7 +12,6 @@ typedef struct SpiceChardev {
>      bool                  blocked;
>      const uint8_t         *datapos;
>      int                   datalen;
> -    QLIST_ENTRY(SpiceChardev) next;
>  } SpiceChardev;
>
>  #define TYPE_CHARDEV_SPICE "chardev-spice"
> diff --git a/include/ui/qemu-spice.h b/include/ui/qemu-spice.h
> index 8c23dfe71797..d34cea2e0fcd 100644
> --- a/include/ui/qemu-spice.h
> +++ b/include/ui/qemu-spice.h
> @@ -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 */
>
> diff --git a/chardev/spice.c b/chardev/spice.c
> index bf7ea1e2940d..9733f0671699 100644
> --- a/chardev/spice.c
> +++ b/chardev/spice.c
> @@ -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 @@ 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,
> diff --git a/softmmu/vl.c b/softmmu/vl.c
> index f476ef89edb7..bc0dcc4f58bd 100644
> --- a/softmmu/vl.c
> +++ b/softmmu/vl.c
> @@ -4125,6 +4125,11 @@ void qemu_init(int argc, char **argv, char **envp)
>      page_size_init();
>      socket_init();
>
> +    /* 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("object"),
>                        user_creatable_add_opts_foreach,
>                        object_create_initial, &error_fatal);
> @@ -4139,10 +4144,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
> diff --git a/ui/spice-core.c b/ui/spice-core.c
> index ecc2ec2c55c2..37dd68f2aba2 100644
> --- a/ui/spice-core.c
> +++ b/ui/spice-core.c
> @@ -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)) {


--
Cheers,
Christophe de Dinechin (IRC c3d)
Christophe de Dinechin July 22, 2020, 10:19 a.m. UTC | #2
On 2020-07-22 at 11:20 CEST, Christophe de Dinechin wrote...
> On 2020-07-22 at 10:49 CEST, Gerd Hoffmann wrote...
>> Initialize 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.
>>
>> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
>
> Looks good to me, but I still need to test how this integrates with my work
> on putting SPICE in a module.

That part does not seem to work so well. It looks like with this move, the
init happens before the module is loaded:

   qemu-system-x86_64 -display spice-app
   Unexpected error in qemu_chr_open_spice_port() at ui/../chardev/spice.c:307:
   qemu-system-x86_64: spice not enabled

I'll try to find the correct fix. Any idea how to address this?

>
> Reviewed-by: Christophe de Dinechin <dinechin@redhat.com>
>
>> ---
>>  include/chardev/spice.h |  1 -
>>  include/ui/qemu-spice.h |  1 -
>>  chardev/spice.c         | 29 ++++++-----------------------
>>  softmmu/vl.c            |  9 +++++----
>>  ui/spice-core.c         |  2 --
>>  5 files changed, 11 insertions(+), 31 deletions(-)
>>
>> diff --git a/include/chardev/spice.h b/include/chardev/spice.h
>> index 1f7339b649dc..2013255f34fd 100644
>> --- a/include/chardev/spice.h
>> +++ b/include/chardev/spice.h
>> @@ -12,7 +12,6 @@ typedef struct SpiceChardev {
>>      bool                  blocked;
>>      const uint8_t         *datapos;
>>      int                   datalen;
>> -    QLIST_ENTRY(SpiceChardev) next;
>>  } SpiceChardev;
>>
>>  #define TYPE_CHARDEV_SPICE "chardev-spice"
>> diff --git a/include/ui/qemu-spice.h b/include/ui/qemu-spice.h
>> index 8c23dfe71797..d34cea2e0fcd 100644
>> --- a/include/ui/qemu-spice.h
>> +++ b/include/ui/qemu-spice.h
>> @@ -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 */
>>
>> diff --git a/chardev/spice.c b/chardev/spice.c
>> index bf7ea1e2940d..9733f0671699 100644
>> --- a/chardev/spice.c
>> +++ b/chardev/spice.c
>> @@ -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 @@ 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,
>> diff --git a/softmmu/vl.c b/softmmu/vl.c
>> index f476ef89edb7..bc0dcc4f58bd 100644
>> --- a/softmmu/vl.c
>> +++ b/softmmu/vl.c
>> @@ -4125,6 +4125,11 @@ void qemu_init(int argc, char **argv, char **envp)
>>      page_size_init();
>>      socket_init();
>>
>> +    /* 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("object"),
>>                        user_creatable_add_opts_foreach,
>>                        object_create_initial, &error_fatal);
>> @@ -4139,10 +4144,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
>> diff --git a/ui/spice-core.c b/ui/spice-core.c
>> index ecc2ec2c55c2..37dd68f2aba2 100644
>> --- a/ui/spice-core.c
>> +++ b/ui/spice-core.c
>> @@ -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)) {


--
Cheers,
Christophe de Dinechin (IRC c3d)
Gerd Hoffmann July 22, 2020, 11:18 a.m. UTC | #3
On Wed, Jul 22, 2020 at 12:19:43PM +0200, Christophe de Dinechin wrote:
> 
> On 2020-07-22 at 11:20 CEST, Christophe de Dinechin wrote...
> > On 2020-07-22 at 10:49 CEST, Gerd Hoffmann wrote...
> >> Initialize 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.
> >>
> >> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> >
> > Looks good to me, but I still need to test how this integrates with my work
> > on putting SPICE in a module.
> 
> That part does not seem to work so well. It looks like with this move, the
> init happens before the module is loaded:
> 
>    qemu-system-x86_64 -display spice-app
>    Unexpected error in qemu_chr_open_spice_port() at ui/../chardev/spice.c:307:
>    qemu-system-x86_64: spice not enabled
> 
> I'll try to find the correct fix. Any idea how to address this?

move chardev init from early to normal:

commit 77297a71e6be60997caf2c55c09ce01a8c492bc2
Author: Gerd Hoffmann <kraxel@redhat.com>
Date:   Wed Jul 22 13:17:28 2020 +0200

    [fixup] spice app

diff --git a/ui/spice-app.c b/ui/spice-app.c
index 40fb2ef57399..03d971b15f0c 100644
--- a/ui/spice-app.c
+++ b/ui/spice-app.c
@@ -117,7 +117,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) {
@@ -162,6 +161,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);
@@ -171,13 +179,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);
Gerd Hoffmann July 22, 2020, 11:26 a.m. UTC | #4
On Wed, Jul 22, 2020 at 11:20:31AM +0200, Christophe de Dinechin wrote:
> 
> On 2020-07-22 at 10:49 CEST, Gerd Hoffmann wrote...
> > Initialize 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.
> >
> > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> 
> Looks good to me, but I still need to test how this integrates with my work
> on putting SPICE in a module.

Hope it simplifies things.  Removes qemu_spice_register_ports(), so one
item less you have to wire up in QemuSpiceOps.

With the qom module bits being merged meanwhile too it should be easier
now to turn chardev/spice.c into a module.

take care,
  Gerd
Christophe de Dinechin July 23, 2020, 8:26 a.m. UTC | #5
On 2020-07-22 at 13:18 CEST, Gerd Hoffmann wrote...
> On Wed, Jul 22, 2020 at 12:19:43PM +0200, Christophe de Dinechin wrote:
>>
>> On 2020-07-22 at 11:20 CEST, Christophe de Dinechin wrote...
>> > On 2020-07-22 at 10:49 CEST, Gerd Hoffmann wrote...
>> >> Initialize 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.
>> >>
>> >> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
>> >
>> > Looks good to me, but I still need to test how this integrates with my work
>> > on putting SPICE in a module.
>>
>> That part does not seem to work so well. It looks like with this move, the
>> init happens before the module is loaded:
>>
>>    qemu-system-x86_64 -display spice-app
>>    Unexpected error in qemu_chr_open_spice_port() at ui/../chardev/spice.c:307:
>>    qemu-system-x86_64: spice not enabled
>>
>> I'll try to find the correct fix. Any idea how to address this?
>
> move chardev init from early to normal:

Works for me.

Reviewed-by: Christophe de Dinechin <dinechin@redhat.com>
Tested-by: Christophe de Dinechin <dinechin@redhat.com>

>
> commit 77297a71e6be60997caf2c55c09ce01a8c492bc2
> Author: Gerd Hoffmann <kraxel@redhat.com>
> Date:   Wed Jul 22 13:17:28 2020 +0200
>
>     [fixup] spice app
>
> diff --git a/ui/spice-app.c b/ui/spice-app.c
> index 40fb2ef57399..03d971b15f0c 100644
> --- a/ui/spice-app.c
> +++ b/ui/spice-app.c
> @@ -117,7 +117,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) {
> @@ -162,6 +161,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);
> @@ -171,13 +179,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);


--
Cheers,
Christophe de Dinechin (IRC c3d)

Patch
diff mbox series

diff --git a/include/chardev/spice.h b/include/chardev/spice.h
index 1f7339b649dc..2013255f34fd 100644
--- a/include/chardev/spice.h
+++ b/include/chardev/spice.h
@@ -12,7 +12,6 @@  typedef struct SpiceChardev {
     bool                  blocked;
     const uint8_t         *datapos;
     int                   datalen;
-    QLIST_ENTRY(SpiceChardev) next;
 } SpiceChardev;
 
 #define TYPE_CHARDEV_SPICE "chardev-spice"
diff --git a/include/ui/qemu-spice.h b/include/ui/qemu-spice.h
index 8c23dfe71797..d34cea2e0fcd 100644
--- a/include/ui/qemu-spice.h
+++ b/include/ui/qemu-spice.h
@@ -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 */
 
diff --git a/chardev/spice.c b/chardev/spice.c
index bf7ea1e2940d..9733f0671699 100644
--- a/chardev/spice.c
+++ b/chardev/spice.c
@@ -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 @@  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,
diff --git a/softmmu/vl.c b/softmmu/vl.c
index f476ef89edb7..bc0dcc4f58bd 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -4125,6 +4125,11 @@  void qemu_init(int argc, char **argv, char **envp)
     page_size_init();
     socket_init();
 
+    /* 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("object"),
                       user_creatable_add_opts_foreach,
                       object_create_initial, &error_fatal);
@@ -4139,10 +4144,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
diff --git a/ui/spice-core.c b/ui/spice-core.c
index ecc2ec2c55c2..37dd68f2aba2 100644
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -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)) {