From nobody Mon Feb 9 16:02:37 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=1603094068; cv=none; d=zohomail.com; s=zohoarc; b=NxSIq20agrR+JbOeB7x1Z874o6rz+TxIQLAH62yZQHu3/bTxPN9X/cCr7DEI2fKrS0xsoYHFN8mgNkKtvUSvfzI0mT5oAhSl8dtHlsMLTq2NB0FlIsK0DRZvjr9dlPx4dz5QP8019PVd8kNxVr1LAPR/waP8jaPsMw/MsEBYjCQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603094068; 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=maxUohMWEPw0bBb1vHeCZsFpQesaxYhCQBd/D4o2Tj0=; b=EthWFTMDrLCiqNMSFmL+SmZHft3C0iJSwRjviXsZ3juSqzq4NYLXDaAgTZ6Hi2LsktsrHwJ8Nr7D4Nt0xg3oFHgSsCfPqBi8ZnTqoCZNt/5ZLQAtVX3wMur7mlflWpU9LWQavArV/Aa8VtN5yxu0vsaVqQjNyLAcJ76ghGmxqHc= 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 1603094068533208.08778445643748; Mon, 19 Oct 2020 00:54:28 -0700 (PDT) Received: from localhost ([::1]:54004 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kUPzu-0006fJ-Ej for importer@patchew.org; Mon, 19 Oct 2020 03:54:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54256) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kUPyG-00059m-Lc for qemu-devel@nongnu.org; Mon, 19 Oct 2020 03:52:44 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:54250) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kUPyE-00086b-Nn for qemu-devel@nongnu.org; Mon, 19 Oct 2020 03:52:44 -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-317-FazRPJ4nN-SdKSDo8wZ6uw-1; Mon, 19 Oct 2020 03:52:39 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D1D9A18A077E for ; Mon, 19 Oct 2020 07:52:38 +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 947E15C641; Mon, 19 Oct 2020 07:52:38 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 8D7F59D0F; 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=1603093961; 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=maxUohMWEPw0bBb1vHeCZsFpQesaxYhCQBd/D4o2Tj0=; b=bBOZJrcLEYqD/Rg4FUzxhuHotelnQxZOwxBRKRZrnreRmx2EriOZZH0mSH20tqMvJjfXtp jZaFVPMRHZEgoTnFdj1rr3b5Uh3TE2/ufti78Qa0m4rbGh5rVMShyK/zjT+siQ/aWJFROB 765lKm0Aa9DZO6TtcG9RjJXeog7zwt4= X-MC-Unique: FazRPJ4nN-SdKSDo8wZ6uw-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH 08/14] spice: wire up monitor in QemuSpiceOps. Date: Mon, 19 Oct 2020 09:52:18 +0200 Message-Id: <20201019075224.14803-9-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.16 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/10/19 01:44:30 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.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_H4=-0.01, 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" Rename qmp_query_spice() to qmp_query_spice_real(), add to QemuSpiceOps. Add new qmp_query_spice() function which calls the real function via QemuSpiceOps if available, otherwise return SpiceInfo.enabled =3D false. Signed-off-by: Gerd Hoffmann --- include/ui/qemu-spice-module.h | 3 +++ ui/spice-core.c | 3 ++- ui/spice-module.c | 17 +++++++++++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/include/ui/qemu-spice-module.h b/include/ui/qemu-spice-module.h index 7422f6404ba0..1f22d557ea2f 100644 --- a/include/ui/qemu-spice-module.h +++ b/include/ui/qemu-spice-module.h @@ -22,6 +22,8 @@ #include #endif =20 +typedef struct SpiceInfo SpiceInfo; + struct QemuSpiceOps { void (*init)(void); void (*display_init)(void); @@ -32,6 +34,7 @@ struct QemuSpiceOps { int (*display_add_client)(int csock, int skipauth, int tls); #ifdef CONFIG_SPICE int (*add_interface)(SpiceBaseInstance *sin); + SpiceInfo* (*qmp_query)(Error **errp); #endif }; =20 diff --git a/ui/spice-core.c b/ui/spice-core.c index 99457c226e6f..eea52f538999 100644 --- a/ui/spice-core.c +++ b/ui/spice-core.c @@ -502,7 +502,7 @@ static QemuOptsList qemu_spice_opts =3D { }, }; =20 -SpiceInfo *qmp_query_spice(Error **errp) +static SpiceInfo *qmp_query_spice_real(Error **errp) { QemuOpts *opts =3D QTAILQ_FIRST(&qemu_spice_opts.head); int port, tls_port; @@ -1001,6 +1001,7 @@ static struct QemuSpiceOps real_spice_ops =3D { .set_pw_expire =3D qemu_spice_set_pw_expire, .display_add_client =3D qemu_spice_display_add_client, .add_interface =3D qemu_spice_add_interface, + .qmp_query =3D qmp_query_spice_real, }; =20 static void spice_register_config(void) diff --git a/ui/spice-module.c b/ui/spice-module.c index 8fbc99c03c55..32223358722c 100644 --- a/ui/spice-module.c +++ b/ui/spice-module.c @@ -19,6 +19,9 @@ =20 #include "qemu/osdep.h" #include "qemu/error-report.h" +#include "qapi/error.h" +#include "qapi/qapi-types-ui.h" +#include "qapi/qapi-commands-ui.h" #include "ui/qemu-spice-module.h" =20 int using_spice; @@ -66,3 +69,17 @@ struct QemuSpiceOps qemu_spice =3D { .set_pw_expire =3D qemu_spice_set_pw_expire_stub, .display_add_client =3D qemu_spice_display_add_client_stub, }; + +#ifdef CONFIG_SPICE + +SpiceInfo *qmp_query_spice(Error **errp) +{ + if (!qemu_spice.qmp_query) { + SpiceInfo *info =3D g_new0(SpiceInfo, 1); + info->enabled =3D false; + return info; + } + return qemu_spice.qmp_query(errp); +} + +#endif --=20 2.27.0