From nobody Mon Feb 9 10:12:11 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=1603095005; cv=none; d=zohomail.com; s=zohoarc; b=Ikhnw4n3fDvjxhJEsnQ9ANvUkap+8aRwrGqvBsjmPg0If1ch0Qane0OZqARqW6cBW9MyZttFnia4j327PkvEJ4Fvy8m0WEoo9/4FyxciBAlyfC7PthF2Vxo4IYFdpxQDx/bCU8RbCHlRBzhTHfG+M5N/o/3kbEi4JCbwF28Tvu0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603095005; 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=eE9mBPuPyoIHUaLUiTwklM3yiYnxfSZ2OJjaqaTZ920=; b=XvTBHdXtnsvQNvC6HAxTk522RSaX6nbD53DHMl9KavWIUqq9yt1xrAQcRigyiV6foOglTC7z2EwrWw9EtbUchP9ux3KuCZaVpYZaCt2mz1ETagkbIt+PLP1OQU0codP8sMy54GNi1DvlBSpVLgQAMpndKhHmyld+4MJBVuhLeK0= 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 1603095005745221.97236084967767; Mon, 19 Oct 2020 01:10:05 -0700 (PDT) Received: from localhost ([::1]:35968 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kUQF2-0006V0-Jj for importer@patchew.org; Mon, 19 Oct 2020 04:10:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54478) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kUPyf-0005f5-V2 for qemu-devel@nongnu.org; Mon, 19 Oct 2020 03:53:10 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:33298) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kUPyc-0008Fl-CX for qemu-devel@nongnu.org; Mon, 19 Oct 2020 03:53:09 -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-412-jEULipKnNNiCYeA5spD1Rw-1; Mon, 19 Oct 2020 03:52:59 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6B5C61054F8E for ; Mon, 19 Oct 2020 07:52:58 +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 3043D6FEE7; Mon, 19 Oct 2020 07:52:38 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 62C189D74; Mon, 19 Oct 2020 09:52:24 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603093985; 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=eE9mBPuPyoIHUaLUiTwklM3yiYnxfSZ2OJjaqaTZ920=; b=c928Bw7YQnqO5tJa4zn7sOgVF52OFDQ5zu1qp0pd/IAo89v/U2aAnbubwKfF5SBaFIGjxP K5ndFRA454m9A1P3dqGdRRCpLj/WoXwIs2diVuusWutMnEOAsjlT3b86QmoWyZCrsxF171 ArPSsei+fpRKUvl6ELA3kxQISZRqGOo= X-MC-Unique: jEULipKnNNiCYeA5spD1Rw-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH 05/14] spice: move add_interface() to QemuSpiceOps. Date: Mon, 19 Oct 2020 09:52:15 +0200 Message-Id: <20201019075224.14803-6-kraxel@redhat.com> In-Reply-To: <20201019075224.14803-1-kraxel@redhat.com> References: <20201019075224.14803-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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/10/19 02:32:01 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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=-1, RCVD_IN_MSPIKE_WL=-0.01, 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: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , Gerd Hoffmann , Markus Armbruster , "Dr. David Alan Gilbert" 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 --- include/ui/qemu-spice-module.h | 7 +++++++ include/ui/qemu-spice.h | 1 - audio/spiceaudio.c | 4 ++-- chardev/spice.c | 2 +- ui/spice-core.c | 5 +++-- ui/spice-input.c | 6 +++--- 6 files changed, 16 insertions(+), 9 deletions(-) diff --git a/include/ui/qemu-spice-module.h b/include/ui/qemu-spice-module.h index dbe09035dade..f93acde5743c 100644 --- a/include/ui/qemu-spice-module.h +++ b/include/ui/qemu-spice-module.h @@ -18,10 +18,17 @@ #ifndef QEMU_SPICE_MODULE_H #define QEMU_SPICE_MODULE_H =20 +#ifdef CONFIG_SPICE +#include +#endif + struct QemuSpiceOps { void (*init)(void); void (*display_init)(void); int (*migrate_info)(const char *h, int p, int t, const char *s); +#ifdef CONFIG_SPICE + int (*add_interface)(SpiceBaseInstance *sin); +#endif }; =20 extern int using_spice; diff --git a/include/ui/qemu-spice.h b/include/ui/qemu-spice.h index a3fd1ea5ade8..6018577c5278 100644 --- a/include/ui/qemu-spice.h +++ b/include/ui/qemu-spice.h @@ -29,7 +29,6 @@ void qemu_spice_input_init(void); void qemu_spice_display_init(void); int qemu_spice_display_add_client(int csock, int skipauth, int tls); -int qemu_spice_add_interface(SpiceBaseInstance *sin); bool qemu_spice_have_display_interface(QemuConsole *con); int qemu_spice_add_display_interface(QXLInstance *qxlin, QemuConsole *con); int qemu_spice_set_passwd(const char *passwd, diff --git a/audio/spiceaudio.c b/audio/spiceaudio.c index ed6dff1dcc41..8967cca12925 100644 --- a/audio/spiceaudio.c +++ b/audio/spiceaudio.c @@ -106,7 +106,7 @@ static int line_out_init(HWVoiceOut *hw, struct audsett= ings *as, out->active =3D 0; =20 out->sin.base.sif =3D &playback_sif.base; - qemu_spice_add_interface (&out->sin.base); + qemu_spice.add_interface(&out->sin.base); #if SPICE_INTERFACE_PLAYBACK_MAJOR > 1 || SPICE_INTERFACE_PLAYBACK_MINOR >= =3D 3 spice_server_set_playback_rate(&out->sin, settings.freq); #endif @@ -215,7 +215,7 @@ static int line_in_init(HWVoiceIn *hw, struct audsettin= gs *as, void *drv_opaque) in->active =3D 0; =20 in->sin.base.sif =3D &record_sif.base; - qemu_spice_add_interface (&in->sin.base); + qemu_spice.add_interface(&in->sin.base); #if SPICE_INTERFACE_RECORD_MAJOR > 2 || SPICE_INTERFACE_RECORD_MINOR >=3D 3 spice_server_set_record_rate(&in->sin, settings.freq); #endif diff --git a/chardev/spice.c b/chardev/spice.c index 7d1fb1771894..1104426e3a11 100644 --- a/chardev/spice.c +++ b/chardev/spice.c @@ -110,7 +110,7 @@ static void vmc_register_interface(SpiceChardev *scd) return; } scd->sin.base.sif =3D &vmc_interface.base; - qemu_spice_add_interface(&scd->sin.base); + qemu_spice.add_interface(&scd->sin.base); scd->active =3D true; trace_spice_vmc_register_interface(scd); } diff --git a/ui/spice-core.c b/ui/spice-core.c index 82d5dbda3e26..483d880a3362 100644 --- a/ui/spice-core.c +++ b/ui/spice-core.c @@ -800,7 +800,7 @@ static void qemu_spice_init(void) migration_state.notify =3D migration_state_notifier; add_migration_state_change_notifier(&migration_state); spice_migrate.base.sif =3D &migrate_interface.base; - qemu_spice_add_interface(&spice_migrate.base); + qemu_spice.add_interface(&spice_migrate.base); =20 qemu_spice_input_init(); =20 @@ -829,7 +829,7 @@ static void qemu_spice_init(void) #endif } =20 -int qemu_spice_add_interface(SpiceBaseInstance *sin) +static int qemu_spice_add_interface(SpiceBaseInstance *sin) { if (!spice_server) { if (QTAILQ_FIRST(&qemu_spice_opts.head) !=3D NULL) { @@ -997,6 +997,7 @@ static struct QemuSpiceOps real_spice_ops =3D { .init =3D qemu_spice_init, .display_init =3D qemu_spice_display_init, .migrate_info =3D qemu_spice_migrate_info, + .add_interface =3D qemu_spice_add_interface, }; =20 static void spice_register_config(void) diff --git a/ui/spice-input.c b/ui/spice-input.c index 21990fa9962b..bbd502564edf 100644 --- a/ui/spice-input.c +++ b/ui/spice-input.c @@ -231,7 +231,7 @@ static void mouse_mode_notifier(Notifier *notifier, voi= d *data) } =20 if (is_absolute) { - qemu_spice_add_interface(&pointer->tablet.base); + qemu_spice.add_interface(&pointer->tablet.base); } else { spice_server_remove_interface(&pointer->tablet.base); } @@ -245,13 +245,13 @@ void qemu_spice_input_init(void) =20 kbd =3D g_malloc0(sizeof(*kbd)); kbd->sin.base.sif =3D &kbd_interface.base; - qemu_spice_add_interface(&kbd->sin.base); + qemu_spice.add_interface(&kbd->sin.base); qemu_add_led_event_handler(kbd_leds, kbd); =20 pointer =3D g_malloc0(sizeof(*pointer)); pointer->mouse.base.sif =3D &mouse_interface.base; pointer->tablet.base.sif =3D &tablet_interface.base; - qemu_spice_add_interface(&pointer->mouse.base); + qemu_spice.add_interface(&pointer->mouse.base); =20 pointer->absolute =3D false; pointer->mouse_mode.notify =3D mouse_mode_notifier; --=20 2.27.0