From nobody Sun Feb 8 20:35:18 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=1601465483; cv=none; d=zohomail.com; s=zohoarc; b=Y2B59+WnDAGm6hvbGb1FzVbXSL6xtiy3MyleGOJNW5qx+ioM2iyc0KkNrt5erSo1wEUmKYQm5Ewneuxt2SL7LtisfZhe8+Krl2ABmSxQNopfkppF9nTldbaNFtSiQ1GXx5owRM1JgMsdqIvs9SAohrX/58IxeTi6eEfaRUBdbm0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601465483; 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=t0zrZnk/mtyFuALg4bVX3ckcLL+sGEU01fnMcB+jN4s=; b=g/IysHu8d1EQ2hwLiITePfEio7zOWwLVWVwBir8CI4lr/OOkcRvm+Q1DVoLRt8Jcf7b/jPFWaqfcgfmECPZyRtl6pul1+hyfMoz2e+Cj2Q9CYTrK7eZ9YiyE8t49YKmJeWgsg2sbafVgA60zdvTBlLZnNnaCaZ4yYik5+ngFWrQ= 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 1601465483556225.73701631804954; Wed, 30 Sep 2020 04:31:23 -0700 (PDT) Received: from localhost ([::1]:57930 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kNaKQ-0004HE-5I for importer@patchew.org; Wed, 30 Sep 2020 07:31:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33480) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kNaIP-0002ZG-7B for qemu-devel@nongnu.org; Wed, 30 Sep 2020 07:29:17 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:51432) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kNaIN-0003rQ-1K for qemu-devel@nongnu.org; Wed, 30 Sep 2020 07:29:16 -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-455-D_4CfcEoOHy214R0OFv7NA-1; Wed, 30 Sep 2020 07:29:11 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7B15880BD66 for ; Wed, 30 Sep 2020 11:29:10 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-56.ams2.redhat.com [10.36.112.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id EFC2019D61; Wed, 30 Sep 2020 11:29:04 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 328459A83; Wed, 30 Sep 2020 13:29:04 +0200 (CEST) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601465353; 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=t0zrZnk/mtyFuALg4bVX3ckcLL+sGEU01fnMcB+jN4s=; b=G6I4Z3sHt2enn/3j/p7BgOFpHsjaDzniyYAoEc2a/W10SfCof/DxajpBAUuXhNYBgQm6ER qsPGy+X7q6HvqCApcM2Y5G2sGncSxFwoF43W7ffniVz4E0Tuijb+vim0Ud7hQwKQvlTR9K 7YIg/6/EJIsBRtBRzSIZuFQ35C4pi3M= X-MC-Unique: D_4CfcEoOHy214R0OFv7NA-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v4 1/6] ui/spice-app: don't use qemu_chr_open_spice_port directly Date: Wed, 30 Sep 2020 13:28:59 +0200 Message-Id: <20200930112904.24397-2-kraxel@redhat.com> In-Reply-To: <20200930112904.24397-1-kraxel@redhat.com> References: <20200930112904.24397-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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-Type: text/plain; charset="utf-8" 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/30 00:26:33 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.469, 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 , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , 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) 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 Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- ui/spice-app.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/ui/spice-app.c b/ui/spice-app.c index 93e105c6ee82..7e0550c79fdd 100644 --- a/ui/spice-app.c +++ b/ui/spice-app.c @@ -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); +}; =20 #define TYPE_CHARDEV_VC "chardev-vc" -DECLARE_INSTANCE_CHECKER(VCChardev, VC_CHARDEV, - TYPE_CHARDEV_VC) +OBJECT_DECLARE_TYPE(VCChardev, VCChardevClass, CHARDEV_VC) =20 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 =3D CHARDEV_VC_GET_CLASS(chr); ChardevBackend *be; const char *fqdn =3D NULL; =20 @@ -80,7 +85,7 @@ static void vc_chr_open(Chardev *chr, be =3D chr_spice_backend_new(); be->u.spiceport.data->fqdn =3D 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); } =20 @@ -91,8 +96,11 @@ static void vc_chr_set_echo(Chardev *chr, bool echo) =20 static void char_vc_class_init(ObjectClass *oc, void *data) { + VCChardevClass *vc =3D CHARDEV_VC_CLASS(oc); ChardevClass *cc =3D CHARDEV_CLASS(oc); =20 + vc->parent_open =3D cc->open; + cc->parse =3D qemu_chr_parse_vc; cc->open =3D vc_chr_open; cc->chr_set_echo =3D vc_chr_set_echo; @@ -103,6 +111,7 @@ static const TypeInfo char_vc_type_info =3D { .parent =3D TYPE_CHARDEV_SPICEPORT, .instance_size =3D sizeof(VCChardev), .class_init =3D char_vc_class_init, + .class_size =3D sizeof(VCChardevClass), }; =20 static void spice_app_atexit(void) --=20 2.27.0 From nobody Sun Feb 8 20:35:18 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=1601465546; cv=none; d=zohomail.com; s=zohoarc; b=KPTrRdPep7yIEd3jAyESVCahPuf6p3FoLDLw77/GhzWVbezQWxey0rjTHxjtZOVGRSbki4i7kDhxRc7csLUwqSG4cUYO1YBgGlzERXAflb0c7FCuDAhuQ24GJiostSk7y8aDs/RXkmD2wjDj5+KmmenOBqUaVvJn3GDLOoCV+oU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601465546; 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=yMBmbg7SUQKRbE0citzPb/yjsoHzYvKjWAcF04LGDBE=; b=hOAR5R3igWmgGK17ZdusHv3FqBoKvd0vlDjv1cGTjeTm6d6HZW7Iwxqgg4rMHTLUea0eicg5aOHeZtb2IuY5HvjQ5FMcFO6JY8HPh8KopshDHKO6i+HMTvjHSGZjkt+/qPwlxHH0rsHaxZ5VVdRxC0dWPk3X2a6GV9DA6GCdKWI= 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 1601465546030967.7619495360965; Wed, 30 Sep 2020 04:32:26 -0700 (PDT) Received: from localhost ([::1]:60146 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kNaLQ-0005Ag-LJ for importer@patchew.org; Wed, 30 Sep 2020 07:32:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33496) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kNaIP-0002aV-TS for qemu-devel@nongnu.org; Wed, 30 Sep 2020 07:29:17 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:30359) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kNaIN-0003ri-JC for qemu-devel@nongnu.org; Wed, 30 Sep 2020 07:29:17 -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-99-VQKvsWsuOyuyanJAIxhRtQ-1; Wed, 30 Sep 2020 07:29:12 -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 6A80A1DE04 for ; Wed, 30 Sep 2020 11:29:11 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-56.ams2.redhat.com [10.36.112.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id EDD5210013C4; Wed, 30 Sep 2020 11:29:04 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 3CCFF9A8F; Wed, 30 Sep 2020 13:29:04 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601465354; 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=yMBmbg7SUQKRbE0citzPb/yjsoHzYvKjWAcF04LGDBE=; b=XurpB163cnZzdKtWwiXhFn0XspdAFf6mxFj0+ikYCntRg0qgNK4W7jIi6HJB8DxmDIMDgL Ln8Z7pYWmD/VCHq1Sxo1KwAn/WkCLw08TyjolFac5Tcv2WOiBQyIXKaktVsePZNRX2WOQm FzyE50k4dnLtkcGzEbLl9HdTqoRTvMI= X-MC-Unique: VQKvsWsuOyuyanJAIxhRtQ-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v4 2/6] chardev/spice: make qemu_chr_open_spice_port static Date: Wed, 30 Sep 2020 13:29:00 +0200 Message-Id: <20200930112904.24397-3-kraxel@redhat.com> In-Reply-To: <20200930112904.24397-1-kraxel@redhat.com> References: <20200930112904.24397-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 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" 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/30 00:26:33 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.469, 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 , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , 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) Signed-off-by: Gerd Hoffmann Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- include/chardev/spice.h | 3 --- chardev/spice.c | 8 ++++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/include/chardev/spice.h b/include/chardev/spice.h index 99f26aedde54..1115502cdfbd 100644 --- a/include/chardev/spice.h +++ b/include/chardev/spice.h @@ -24,7 +24,4 @@ typedef struct SpiceChardev SpiceChardev; DECLARE_INSTANCE_CHECKER(SpiceChardev, SPICE_CHARDEV, TYPE_CHARDEV_SPICE) =20 -void qemu_chr_open_spice_port(Chardev *chr, ChardevBackend *backend, - bool *be_opened, Error **errp); - #endif diff --git a/chardev/spice.c b/chardev/spice.c index bf7ea1e2940d..051c23a84f4c 100644 --- a/chardev/spice.c +++ b/chardev/spice.c @@ -296,10 +296,10 @@ static void qemu_chr_open_spice_vmc(Chardev *chr, chr_open(chr, type); } =20 -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 =3D backend->u.spiceport.data; const char *name =3D spiceport->fqdn; --=20 2.27.0 From nobody Sun Feb 8 20:35:18 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=1601465785; cv=none; d=zohomail.com; s=zohoarc; b=IDSusnbckI5wAra5RJoorqcZh7GRY69nI9T8GvT483TNPHuZYFXpxLxtDvwq4xgYNnxMwpkKlAiMb9RF9OY4rgLEbi56gfRkvt72K/TzA7C6XOTDE/RPYnFUlH0KCs1tV7qr4UGIwHvH2oinGx+PyK5/oHzvy8w/QtR4E39wDsw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601465785; 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=F/KTbHxhIpuIp9j8YA3OOM80mFk+8novFfFxYryTHG8=; b=AM9SVvsiMUBVzsjYoYLO65Ta6PEpx/TTrrUmWgz4vlWiVkbrLJ4wI+llbkRAY/Fh1k4QfcY71e9Ss8d/RgikYoeoQbynByP5YJjidYZNPppSGYiABqidlnNR5i+x8BuR8/634hHQIcdX3JqX37UlHVHRiq54lBDCtzBvujsMbnM= 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 1601465785743830.7831250570564; Wed, 30 Sep 2020 04:36:25 -0700 (PDT) Received: from localhost ([::1]:43658 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kNaPI-0001kB-BE for importer@patchew.org; Wed, 30 Sep 2020 07:36:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33530) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kNaIR-0002cc-1S for qemu-devel@nongnu.org; Wed, 30 Sep 2020 07:29:19 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:30357) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kNaIN-0003rd-JC for qemu-devel@nongnu.org; Wed, 30 Sep 2020 07:29:18 -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-582-2-x25vN5NIKAcCe7xSJ6KA-1; Wed, 30 Sep 2020 07:29:12 -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 1E4301DE01 for ; Wed, 30 Sep 2020 11:29:11 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-56.ams2.redhat.com [10.36.112.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id F224C7BE42; Wed, 30 Sep 2020 11:29:04 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 4E03F9A95; Wed, 30 Sep 2020 13:29:04 +0200 (CEST) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601465354; 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=F/KTbHxhIpuIp9j8YA3OOM80mFk+8novFfFxYryTHG8=; b=JHpAjHgJeuzm9MwbKsZ7hm6xyeKGcMj0YiNBuagUdgbbGl95s+o9odewWd23tw9CUur6ed xG1xrsOOXsKkTB5m9PTu5tqYk/8ddiGuE6M3OCFf0CaIEuMXDXp6RQ0BfheEXBK4SsZPDL WWGI/8mmUyl3roFJizH0NqJjWTNakAQ= X-MC-Unique: 2-x25vN5NIKAcCe7xSJ6KA-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v4 3/6] chardev/spice: simplify chardev setup Date: Wed, 30 Sep 2020 13:29:01 +0200 Message-Id: <20200930112904.24397-4-kraxel@redhat.com> In-Reply-To: <20200930112904.24397-1-kraxel@redhat.com> References: <20200930112904.24397-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=63.128.21.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/30 00:31:59 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.469, 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" 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 12474d88f40e..0e8ec3f0d776 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 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 50d8c2e42e62..48b51201a8f9 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 7e0550c79fdd..026124ef56a0 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 10aa309f78f7..47700b220059 100644 --- a/ui/spice-core.c +++ b/ui/spice-core.c @@ -812,8 +812,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 Sun Feb 8 20:35:18 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=1601465488; cv=none; d=zohomail.com; s=zohoarc; b=eNIGQ+JbdTuY/tWYo8v3MIPc9LYwYh5tHi4OhHTq6mP2/FNNB1//yapHhMpsuWXObHu1g24X07pgBXtfJvOBUg4cKHMis6ruz4MDya2WSKOpf7kPHXbc86XOLkUA6Ux8Lk19QR5utOanj3FUiui913bCXClpnKYRjpTLpAt0CFo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601465488; 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=KZDvwu6aODUJ1KxrLmS6Mb7akFAQsgS+WoI3m7nzsEw=; b=RgM6PG36dJLrHJYMawzmOSxo+RyrD4MiiTSFLscVGlUipL8VGviyRnjRKIDOQ/AWwG8BroU6Z6Nv/5LfWdOf1LR/vCVbcv1JLCC15afB4TOhiU1ZzosEdBMQDG0n6Bs2sPQzmfZEo0jYkKeN8pCR9n9DDDnTwpGfRHM82ncuc+Q= 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 1601465488311720.0038857875386; Wed, 30 Sep 2020 04:31:28 -0700 (PDT) Received: from localhost ([::1]:58300 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kNaKU-0004RG-TD for importer@patchew.org; Wed, 30 Sep 2020 07:31:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33542) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kNaIS-0002gm-VD for qemu-devel@nongnu.org; Wed, 30 Sep 2020 07:29:20 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:45535) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kNaIO-0003sC-UD for qemu-devel@nongnu.org; Wed, 30 Sep 2020 07:29:20 -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-39-SlLWav82MYyzsYwORPVy4g-1; Wed, 30 Sep 2020 07:29:12 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0B3901015CB4 for ; Wed, 30 Sep 2020 11:29:11 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-56.ams2.redhat.com [10.36.112.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0AE4A78807; Wed, 30 Sep 2020 11:29:05 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 5A1E943BFB0; Wed, 30 Sep 2020 13:29:04 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601465356; 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=KZDvwu6aODUJ1KxrLmS6Mb7akFAQsgS+WoI3m7nzsEw=; b=cB4pOCKf1ivECYUQfUIGVexk/OoeiqWFmu3SZhfrbizgb7duZStNB4ZkwS8Z6Fb9j6augn iUZ6FxbQKXf+zZKJgFQBUwepPJfHuSNZs3iWD1syWjCqE/p45089/V+aL/jm4EcHsEpJLk orPT7MzTia9ERgvsgPSndfXY0iOwN0k= X-MC-Unique: SlLWav82MYyzsYwORPVy4g-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v4 4/6] meson: add spice_headers dependency. Date: Wed, 30 Sep 2020 13:29:02 +0200 Message-Id: <20200930112904.24397-5-kraxel@redhat.com> In-Reply-To: <20200930112904.24397-1-kraxel@redhat.com> References: <20200930112904.24397-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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=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/30 00:26:33 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.469, 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" Used for files which (with CONFIG_SPICE=3Dy) depend on spice header files to pick up some enum, but which do not depend on on the actual spice shared library. Signed-off-by: Gerd Hoffmann --- audio/meson.build | 2 +- meson.build | 2 ++ monitor/meson.build | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/audio/meson.build b/audio/meson.build index 18a831129ed0..7d53b0f920ff 100644 --- a/audio/meson.build +++ b/audio/meson.build @@ -1,5 +1,5 @@ +softmmu_ss.add([spice_headers, files('audio.c')]) softmmu_ss.add(files( - 'audio.c', 'audio_legacy.c', 'mixeng.c', 'noaudio.c', diff --git a/meson.build b/meson.build index d36dd085b5fc..76f51b9ab323 100644 --- a/meson.build +++ b/meson.build @@ -213,9 +213,11 @@ if 'CONFIG_LIBJACK' in config_host jack =3D declare_dependency(link_args: config_host['JACK_LIBS'].split()) endif spice =3D not_found +spice_headers =3D not_found if 'CONFIG_SPICE' in config_host spice =3D declare_dependency(compile_args: config_host['SPICE_CFLAGS'].s= plit(), link_args: config_host['SPICE_LIBS'].split()) + spice_headers =3D declare_dependency(compile_args: config_host['SPICE_CF= LAGS'].split()) endif rt =3D cc.find_library('rt', required: false) libmpathpersist =3D not_found diff --git a/monitor/meson.build b/monitor/meson.build index eb2a534fdc88..6d00985ace7a 100644 --- a/monitor/meson.build +++ b/monitor/meson.build @@ -3,7 +3,7 @@ qmp_ss.add(files('monitor.c', 'qmp.c', 'qmp-cmds-control.c'= )) softmmu_ss.add(files( 'hmp-cmds.c', 'hmp.c', - 'qmp-cmds.c', )) +softmmu_ss.add([spice_headers, files('qmp-cmds.c')]) =20 specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: [files('misc.c'), spice]) --=20 2.27.0 From nobody Sun Feb 8 20:35:18 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=1601465588; cv=none; d=zohomail.com; s=zohoarc; b=PWxqGoj+WeZMriGfkCwrorgrI40nP8rNe7dEDyzK0C3Py1ywVFzZ5Ze2qs4cIrdqnGg9a7k2D9b94oeNwk81RIohuhnVJokS2RLneiswFHue+uwYhNDIj09OJFf1U4bMpPS6bVxNWFe06QM9RQQwZHGRiwP6wpxLAc3fZbivRao= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601465588; 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=yi87klUKUxRGXiIeM4gnxeQboyJsO2y9BFg7l4g8KgQ=; b=f4zpj6CONii3fLQ22lUPsJXF78NMV8yvkul5UZt/+QdQppFC9xUZeB+bgJngauBLtSbmfXMB6faDm3MYdmnicITj07jjY0j8HPCLSGfDS+BfabcsJEsKry1Cap8ggKTIAdzYfCxMCYgIZk3jxx2CNVD5+v7R713Tm8qpJtjlFXA= 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 1601465588506644.0641347511093; Wed, 30 Sep 2020 04:33:08 -0700 (PDT) Received: from localhost ([::1]:33460 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kNaM6-0005nf-V5 for importer@patchew.org; Wed, 30 Sep 2020 07:33:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33556) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kNaIU-0002kT-I1 for qemu-devel@nongnu.org; Wed, 30 Sep 2020 07:29:22 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:56059) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kNaIS-0003sn-T7 for qemu-devel@nongnu.org; Wed, 30 Sep 2020 07:29:22 -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-488-HRv01Kx4MG6xjMKfRWnz5A-1; Wed, 30 Sep 2020 07:29:18 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 64DF31868408 for ; Wed, 30 Sep 2020 11:29:17 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-56.ams2.redhat.com [10.36.112.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 50F005D9D2; Wed, 30 Sep 2020 11:29:11 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 630FD43BFB1; Wed, 30 Sep 2020 13:29:04 +0200 (CEST) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601465360; 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=yi87klUKUxRGXiIeM4gnxeQboyJsO2y9BFg7l4g8KgQ=; b=F317I5djAql6ekFE1uRBdAHxZcNLdFidaKmdPYU1s73/PU11seS+I6MZuH1X9upda0IRQQ 2uAD+z5cbGpVJjvvp4pxQ2Jv0618vh+9DVhXb1QeoH6K3VYF3JH0FIhFlqPHjV1TibBJ0h 7WW90PvS4FbQXKoVhv7mrwgJM/ijBQI= X-MC-Unique: HRv01Kx4MG6xjMKfRWnz5A-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v4 5/6] meson: add spice dependency to core spice source files. Date: Wed, 30 Sep 2020 13:29:03 +0200 Message-Id: <20200930112904.24397-6-kraxel@redhat.com> In-Reply-To: <20200930112904.24397-1-kraxel@redhat.com> References: <20200930112904.24397-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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=63.128.21.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/30 00:31:59 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.469, 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" Right now it happens to work by pure luck because the spice chardevs add the spice dependency to the softmmu source set. That'll change though once we start building spice chardevs as module, so lets fix it properly. Signed-off-by: Gerd Hoffmann --- ui/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/meson.build b/ui/meson.build index dd6c11013645..0798d3dc568f 100644 --- a/ui/meson.build +++ b/ui/meson.build @@ -14,7 +14,7 @@ softmmu_ss.add(files( )) =20 softmmu_ss.add(when: 'CONFIG_LINUX', if_true: files('input-linux.c')) -softmmu_ss.add(when: 'CONFIG_SPICE', if_true: files('spice-core.c', 'spice= -input.c', 'spice-display.c')) +softmmu_ss.add(when: [spice, 'CONFIG_SPICE'], if_true: files('spice-core.c= ', 'spice-input.c', 'spice-display.c')) softmmu_ss.add(when: [cocoa, 'CONFIG_COCOA'], if_true: files('cocoa.m')) =20 vnc_ss =3D ss.source_set() --=20 2.27.0 From nobody Sun Feb 8 20:35:18 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=1601465681; cv=none; d=zohomail.com; s=zohoarc; b=KfxvJrf4jbhWXwmAGNGwCmTXn000NwdJQc8p5hoXRA5grUUoHCnRoJbp2p7C2pib7DcXX+6BAyjqnOayEacwLvwZDlFKXF92vW1kZwh7AcZ7rWNVSk3XU7bpaEWFJmPPFcM88SRCGeLVy15nOWpM1ScDeOcketg9Hrh/ghBoHVU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601465681; 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=oal3Tf1tUaESgH+g0IqJDaI2vrUq+fcCgVPBMvgFDMY=; b=NmJtFMozjm5+gBcJkqWaqWSGamyp7yzUsTZZSnXUz4pJboLtK8ed9TdvNO8mSOPyFLzcJRH13iMhEZPPa/EMNt1IBFTSybTm1R5314YygN123lRtsHd748U9gBGAdcPgdPPkazO+Es/++irWWOwCTfSoxrWjlY0/yGNKo9Vf16I= 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 1601465681857442.3949538391189; Wed, 30 Sep 2020 04:34:41 -0700 (PDT) Received: from localhost ([::1]:37848 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kNaNc-0007kM-Ky for importer@patchew.org; Wed, 30 Sep 2020 07:34:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33524) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kNaIQ-0002bp-Mb for qemu-devel@nongnu.org; Wed, 30 Sep 2020 07:29:18 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:36140) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kNaIN-0003rj-JK for qemu-devel@nongnu.org; Wed, 30 Sep 2020 07:29:18 -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-131-F9c7MkkyNKqMuUbWElfOsg-1; Wed, 30 Sep 2020 07:29:12 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8F3E5807340 for ; Wed, 30 Sep 2020 11:29:11 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-56.ams2.redhat.com [10.36.112.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5010C19D61; Wed, 30 Sep 2020 11:29:11 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 6D88543BFB2; Wed, 30 Sep 2020 13:29:04 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601465354; 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=oal3Tf1tUaESgH+g0IqJDaI2vrUq+fcCgVPBMvgFDMY=; b=jEMW1st6sZAXqFu1yvpN6ObYuBHzc9FWe6rSXPF/dPGNdUrJYNVBRrCbtywD/gra1poP66 ifuXHua8zHK3nr7RvGfgmpZRBkgKNp8mteqHMusTuwJw01ONU04fo3n49jTZBFezEtaa6t 5RDbEjjgnsoSpxUI8iEjLm36kcVVI3Q= X-MC-Unique: F9c7MkkyNKqMuUbWElfOsg-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v4 6/6] chardev/spice: build spice chardevs as module Date: Wed, 30 Sep 2020 13:29:04 +0200 Message-Id: <20200930112904.24397-7-kraxel@redhat.com> In-Reply-To: <20200930112904.24397-1-kraxel@redhat.com> References: <20200930112904.24397-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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=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/30 00:26:33 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.469, 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..85f3464d2971 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')) + chardev_modules +=3D { 'spice': module_ss } +endif + modules +=3D { 'chardev': chardev_modules } --=20 2.27.0