From nobody Fri Apr 26 03:46:22 2024 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=1600245718; cv=none; d=zohomail.com; s=zohoarc; b=ZFCVbQ5/4Eulhp5EHsOzisQyP7a1iSsT8JDfiovCLP7heQxZqOlnAypY24HFw93bg9XX7l5E0KWGbP65zNQMW2yzTre4cWwOMaqrGsWScXfPdgyzJpC+YVfJsEJ2UIIaAsZnqHtSvYABXQp9NJNYirAlPk+uXBuMW6DmG6jwN0k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600245718; 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=7xMj2ZaVA4X6lYAdve59AO8ZeXMmIV9HMh7uFqSly8A=; b=nl8MjUczuxOJre2kTQuJBLZQTlyYaK6daJjX2Z329rNXoYnXwaIkrs50L7a8SAFXK5nh44OoWlj5ql7gkIbgN3g2EOrnu7tLPIT2DyTbu+se1LGpfLoZXlNPR+0yr4spC9geGblcCjiFOH6HZzNO3unuscK5Gn9HGCTdOJ4qmpc= 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 1600245718128914.3444960465391; Wed, 16 Sep 2020 01:41:58 -0700 (PDT) Received: from localhost ([::1]:37494 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kIT0n-0002Zv-1V for importer@patchew.org; Wed, 16 Sep 2020 04:41:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34024) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kISyN-00086h-GE for qemu-devel@nongnu.org; Wed, 16 Sep 2020 04:39:27 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:58161 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kISyL-0007J8-It for qemu-devel@nongnu.org; Wed, 16 Sep 2020 04:39:27 -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-547-6g911lB4Me-U-DOcOQdAZg-1; Wed, 16 Sep 2020 04:39:22 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DDF7F81F014 for ; Wed, 16 Sep 2020 08:39:21 +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 79462100EBA4; Wed, 16 Sep 2020 08:39:14 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id A24CB1750A; Wed, 16 Sep 2020 10:39:13 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600245564; 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=7xMj2ZaVA4X6lYAdve59AO8ZeXMmIV9HMh7uFqSly8A=; b=fFxpsXNg4xb5q5+SNMmBH2/zKoAAmaLa1pDUBWiX/6iqbV1F9Ht7X8HZofxAE38BqxHQno PG/0X0wPEHUJHGWaWUHT6XTLBr8Z/mp5hmJi7Wk/n0KwZ9UclfLgUydHaG4gXqt0mby4vO z3yXCwxUFxDxgajdv2q5bFaVD3FsO4s= X-MC-Unique: 6g911lB4Me-U-DOcOQdAZg-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v2 1/2] spice: simplify chardev setup Date: Wed, 16 Sep 2020 10:39:12 +0200 Message-Id: <20200916083913.11902-2-kraxel@redhat.com> In-Reply-To: <20200916083913.11902-1-kraxel@redhat.com> References: <20200916083913.11902-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0.001 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-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/16 02:41:36 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 99f26aedde54..543b93d38ce3 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 bf7ea1e2940d..9733f0671699 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 @@ 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..062468d76178 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -4121,6 +4121,11 @@ void qemu_init(int argc, char **argv, char **envp) page_size_init(); socket_init(); =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("object"), user_creatable_add_opts_foreach, object_create_initial, &error_fatal); @@ -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 93e105c6ee82..0e2c57cbc6f1 100644 --- a/ui/spice-app.c +++ b/ui/spice-app.c @@ -120,7 +120,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) { @@ -165,6 +164,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); @@ -174,13 +182,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 From nobody Fri Apr 26 03:46:22 2024 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=1600245666; cv=none; d=zohomail.com; s=zohoarc; b=Lpw/wXQqfNgi2aiY8WAA0gJ/3z98j/nDXtuG1/jpL75enBEPa3fbvbbDMwea2cmBchKJ/D3sijbbz40qkUWKNFEHquynZP1DRQfnB7KdprQAdSoNyNzW4aAvh9unYm3T2xKnGZ8WMYBmOLQo0CXPiJWxthBBEfHjdjaiTDmXJqo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600245666; 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=KG6ddk9BmUKE/8hK+BnmD/IZ/5/3gjQQ8fBejRRv0ws=; b=Ce5/bXEmd5Vuf6VYV/M8iOY8c1MxIM5ec+ScA/igy04TfVXhfy6ENiaqI/oPzvVFCbED6kixShUeuCqgl6ku51/XpyO2p5UzIIslZZszXmzXCtCgaefuE2r+tErhwI+UMPumJjpwggs/emQDc69Gh/unEMs5FdvMAl7/hzq+NM0= 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 1600245666202229.71760349113254; Wed, 16 Sep 2020 01:41:06 -0700 (PDT) Received: from localhost ([::1]:33872 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kISzx-00013o-2d for importer@patchew.org; Wed, 16 Sep 2020 04:41:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34040) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kISyO-00088P-UB for qemu-devel@nongnu.org; Wed, 16 Sep 2020 04:39:28 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:55071) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kISyN-0007JO-7w for qemu-devel@nongnu.org; Wed, 16 Sep 2020 04:39:28 -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-413-mtYjLHY1MSOWv8yIoKv8-w-1; Wed, 16 Sep 2020 04:39:24 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A27EB800FFF for ; Wed, 16 Sep 2020 08:39:23 +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 7C7447512E; Wed, 16 Sep 2020 08:39:14 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id AD0509D5A; Wed, 16 Sep 2020 10:39:13 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600245566; 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=KG6ddk9BmUKE/8hK+BnmD/IZ/5/3gjQQ8fBejRRv0ws=; b=d5VUhBNZDToHxZbRjQHqHkHaOEdee11z+fwsQCV6hhPHRTmXu6uJgUK3QhGiYv9SCZD3/n BQo3yXju0o2r0Km0yJUTrUjZ5x36ok/SQBcgG1m/FjwkTWWmWxXCTu8c9h8uonzXCiaZIO AyYl8nEpohANVW6Z6zID99R9cRg1TXE= X-MC-Unique: mtYjLHY1MSOWv8yIoKv8-w-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v2 2/2] chardev: build spice chardevs as module Date: Wed, 16 Sep 2020 10:39:13 +0200 Message-Id: <20200916083913.11902-3-kraxel@redhat.com> In-Reply-To: <20200916083913.11902-1-kraxel@redhat.com> References: <20200916083913.11902-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0.001 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=216.205.24.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/16 02:16:02 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_H5=0.001, RCVD_IN_MSPIKE_WL=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" Signed-off-by: Gerd Hoffmann --- util/module.c | 2 ++ chardev/meson.build | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/util/module.c b/util/module.c index 34772e7d87eb..86781c207f7d 100644 --- a/util/module.c +++ b/util/module.c @@ -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" }, }; =20 static bool module_loaded_qom_all; diff --git a/chardev/meson.build b/chardev/meson.build index 54e88d031004..a16ea8ab7c24 100644 --- a/chardev/meson.build +++ b/chardev/meson.build @@ -32,7 +32,6 @@ libchardev =3D static_library('chardev', chardev_ss.sourc= es() + genh, chardev =3D declare_dependency(link_whole: libchardev) =20 softmmu_ss.add(files('chardev-sysemu.c', 'msmouse.c', 'wctablet.c', 'testd= ev.c')) -softmmu_ss.add(when: ['CONFIG_SPICE', spice], if_true: files('spice.c')) =20 chardev_modules =3D {} =20 @@ -42,4 +41,10 @@ if config_host.has_key('CONFIG_BRLAPI') chardev_modules +=3D { 'baum': module_ss } endif =20 +if config_host.has_key('CONFIG_SPICE') + module_ss =3D ss.source_set() + module_ss.add(when: [spice], if_true: [files('spice.c'), spice]) + chardev_modules +=3D { 'spice': module_ss } +endif + modules +=3D { 'chardev': chardev_modules } --=20 2.27.0