[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 08/14] spice: wire up monitor in QemuSpiceOps.
From: |
Gerd Hoffmann |
Subject: |
[PULL 08/14] spice: wire up monitor in QemuSpiceOps. |
Date: |
Thu, 22 Oct 2020 07:12:17 +0200 |
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 = false.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-id: 20201019075224.14803-9-kraxel@redhat.com
---
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 <spice.h>
#endif
+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
};
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 = {
},
};
-SpiceInfo *qmp_query_spice(Error **errp)
+static SpiceInfo *qmp_query_spice_real(Error **errp)
{
QemuOpts *opts = QTAILQ_FIRST(&qemu_spice_opts.head);
int port, tls_port;
@@ -1001,6 +1001,7 @@ static struct QemuSpiceOps real_spice_ops = {
.set_pw_expire = qemu_spice_set_pw_expire,
.display_add_client = qemu_spice_display_add_client,
.add_interface = qemu_spice_add_interface,
+ .qmp_query = qmp_query_spice_real,
};
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 @@
#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"
int using_spice;
@@ -66,3 +69,17 @@ struct QemuSpiceOps qemu_spice = {
.set_pw_expire = qemu_spice_set_pw_expire_stub,
.display_add_client = qemu_spice_display_add_client_stub,
};
+
+#ifdef CONFIG_SPICE
+
+SpiceInfo *qmp_query_spice(Error **errp)
+{
+ if (!qemu_spice.qmp_query) {
+ SpiceInfo *info = g_new0(SpiceInfo, 1);
+ info->enabled = false;
+ return info;
+ }
+ return qemu_spice.qmp_query(errp);
+}
+
+#endif
--
2.27.0
- [PULL 00/14] Modules 20201022 patches, Gerd Hoffmann, 2020/10/22
- [PULL 04/14] spice: move display_init() to QemuSpiceOps., Gerd Hoffmann, 2020/10/22
- [PULL 01/14] spice: add module helpers, Gerd Hoffmann, 2020/10/22
- [PULL 13/14] opengl: build egl-headless display modular, Gerd Hoffmann, 2020/10/22
- [PULL 02/14] spice: add QemuSpiceOps, move migrate_info, Gerd Hoffmann, 2020/10/22
- [PULL 03/14] spice: move qemu_spice_init() to QemuSpiceOps., Gerd Hoffmann, 2020/10/22
- [PULL 08/14] spice: wire up monitor in QemuSpiceOps.,
Gerd Hoffmann <=
- [PULL 09/14] spice: load module when enabled on the cmdline, Gerd Hoffmann, 2020/10/22
- [PULL 12/14] spice: flip modules switch, Gerd Hoffmann, 2020/10/22
- [PULL 14/14] opengl: build opengl helper code modular, Gerd Hoffmann, 2020/10/22
- [PULL 10/14] modules: dependencies infrastructure, Gerd Hoffmann, 2020/10/22
- [PULL 11/14] modules: add spice dependencies, Gerd Hoffmann, 2020/10/22
- [PULL 07/14] spice: move display_add_client() to QemuSpiceOps., Gerd Hoffmann, 2020/10/22
- [PULL 05/14] spice: move add_interface() to QemuSpiceOps., Gerd Hoffmann, 2020/10/22
- [PULL 06/14] spice: move auth functions to QemuSpiceOps., Gerd Hoffmann, 2020/10/22
- Re: [PULL 00/14] Modules 20201022 patches, Peter Maydell, 2020/10/22