From nobody Mon Feb 9 09:28:42 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1600338484; cv=none; d=zohomail.com; s=zohoarc; b=l3HlwNStNsuthNIdsQ+vdOOM03KFL2emO8RTQ4Rz7gIxzySQ1LwJW7Eu3HE7SOpn13Kxu+1XtmWkAbpf2fzBqbM6JX6A35h7tKsBNpFCkREwJJI6nH76nCJ8eVQ5gKxJ00nBrtd0TnUbXYL57U110TIsXKF+0oE4rGBvLth7XIk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600338484; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=jDFRGipGVy6aGhXPBoA6SW9CCJ32i9AByRy7fGDR6lk=; b=UedrGVqqKwEam9ZUZUBp1tun+uZSH6SBAc3/b2/U6yRqdXdxcgKcOaZSBgpaIblidMiIl2+Mu9VkZ/MAak6kK1jgzKEggBWQ6z+b58u14ru5qew/kdw7RjKcmCrdAzrEgMwBZJ8BWUjGsEXQtjTa9dwbWX7OPFgzs7NUoi84BTU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1600338484206464.68633626850976; Thu, 17 Sep 2020 03:28:04 -0700 (PDT) Received: from localhost ([::1]:40836 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kIr90-0003p8-Vw for importer@patchew.org; Thu, 17 Sep 2020 06:28:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60980) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kIqv6-0004Sf-1i for qemu-devel@nongnu.org; Thu, 17 Sep 2020 06:13:40 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:40383) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kIquy-0003oq-TA for qemu-devel@nongnu.org; Thu, 17 Sep 2020 06:13:39 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-3-7JveRjBEMlW_1n7-q85PPQ-1; Thu, 17 Sep 2020 06:13:29 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 872C8ACE31 for ; Thu, 17 Sep 2020 10:13:28 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-85.ams2.redhat.com [10.36.112.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5B11281C45; Thu, 17 Sep 2020 10:13:21 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 9195A9A83; Thu, 17 Sep 2020 12:13:20 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600337611; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jDFRGipGVy6aGhXPBoA6SW9CCJ32i9AByRy7fGDR6lk=; b=YbEUWbbgklWB/Qhy+P1iKeFd35Ak3CReaXDJ506qcxYlQM42d+1a8w7DTRmKxDDd/icLVG mvwQdvV3Vbd0VevYSSzYr+GNIJqpwLIZ+QybmJ7w3i8ouY7lgCR4BWXm9W88T/4I7pTOzG +fbWrz+qMzprY8oCOWXKZFQE/96LG5w= X-MC-Unique: 7JveRjBEMlW_1n7-q85PPQ-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v3 3/4] chardev/spice: simplify chardev setup Date: Thu, 17 Sep 2020 12:13:19 +0200 Message-Id: <20200917101320.25285-4-kraxel@redhat.com> In-Reply-To: <20200917101320.25285-1-kraxel@redhat.com> References: <20200917101320.25285-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=207.211.31.81; envelope-from=kraxel@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/17 03:47:35 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -50 X-Spam_score: -5.1 X-Spam_bar: ----- X-Spam_report: (-5.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.999, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Gerd Hoffmann , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" 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 --- 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(-) diff --git a/include/chardev/spice.h b/include/chardev/spice.h index 1115502cdfbd..58e5b727e9fe 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; =20 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 por= t, int tls_port, #else #define SPICE_NEEDS_SET_MM_TIME 0 #endif -void qemu_spice_register_ports(void); =20 #else /* CONFIG_SPICE */ =20 diff --git a/chardev/spice.c b/chardev/spice.c index 051c23a84f4c..7d1fb1771894 100644 --- a/chardev/spice.c +++ b/chardev/spice.c @@ -14,9 +14,6 @@ typedef struct SpiceCharSource { SpiceChardev *scd; } SpiceCharSource; =20 -static QLIST_HEAD(, SpiceChardev) spice_chars =3D - QLIST_HEAD_INITIALIZER(spice_chars); - static int vmc_write(SpiceCharDeviceInstance *sin, const uint8_t *buf, int= len) { SpiceChardev *scd =3D container_of(sin, SpiceChardev, sin); @@ -216,8 +213,6 @@ static void char_spice_finalize(Object *obj) =20 vmc_unregister_interface(s); =20 - 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) =20 s->active =3D false; s->sin.subtype =3D g_strdup(subtype); - - QLIST_INSERT_HEAD(&spice_chars, s, next); } =20 static void qemu_chr_open_spice_vmc(Chardev *chr, @@ -310,28 +303,18 @@ static void qemu_chr_open_spice_port(Chardev *chr, return; } =20 + if (!using_spice) { + error_setg(errp, "spice not enabled"); + return; + } + chr_open(chr, "port"); =20 *be_opened =3D false; s =3D SPICE_CHARDEV(chr); s->sin.portname =3D g_strdup(name); =20 - 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 =3D=3D NULL) { - continue; - } - vmc_register_interface(s); - } + vmc_register_interface(s); } =20 static void qemu_chr_parse_spice_vmc(QemuOpts *opts, ChardevBackend *backe= nd, diff --git a/softmmu/vl.c b/softmmu/vl.c index f7b103467c02..bf65bce0fcba 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -4125,6 +4125,11 @@ void qemu_init(int argc, char **argv, char **envp) user_creatable_add_opts_foreach, object_create_initial, &error_fatal); =20 + /* spice needs the timers to be initialized by this point */ + /* spice must initialize before audio as it changes the default auiode= v */ + /* 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); =20 @@ -4133,10 +4138,6 @@ void qemu_init(int argc, char **argv, char **envp) fsdev_init_func, NULL, &error_fatal); #endif =20 - /* spice needs the timers to be initialized by this point */ - /* spice must initialize before audio as it changes the default auiode= v */ - 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-app.c b/ui/spice-app.c index 3fe9d42e939f..33568709d7a5 100644 --- a/ui/spice-app.c +++ b/ui/spice-app.c @@ -129,7 +129,6 @@ static void spice_app_atexit(void) static void spice_app_display_early_init(DisplayOptions *opts) { QemuOpts *qopts; - ChardevBackend *be =3D chr_spice_backend_new(); GError *err =3D NULL; =20 if (opts->has_full_screen) { @@ -174,6 +173,15 @@ static void spice_app_display_early_init(DisplayOption= s *opts) qemu_opt_set(qopts, "gl", opts->has_gl ? "on" : "off", &error_abort); display_opengl =3D opts->has_gl; #endif +} + +static void spice_app_display_init(DisplayState *ds, DisplayOptions *opts) +{ + ChardevBackend *be =3D chr_spice_backend_new(); + QemuOpts *qopts; + GError *err =3D NULL; + gchar *uri; + be->u.spiceport.data->fqdn =3D 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(DisplayOption= s *opts) qemu_opt_set(qopts, "mode", "control", &error_abort); =20 qapi_free_ChardevBackend(be); -} - -static void spice_app_display_init(DisplayState *ds, DisplayOptions *opts) -{ - GError *err =3D NULL; - gchar *uri; - uri =3D g_strjoin("", "spice+unix://", app_dir, "/", "spice.sock", NUL= L); info_report("Launching display with URI: %s", uri); g_app_info_launch_default_for_uri(uri, NULL, &err); 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); =20 - qemu_spice_register_ports(); - #ifdef HAVE_SPICE_GL if (qemu_opt_get_bool(opts, "gl", 0)) { if ((port !=3D 0) || (tls_port !=3D 0)) { --=20 2.27.0