mirror of
https://gitlab.com/qemu-project/qemu.git
synced 2024-12-08 22:02:44 +03:00
spice: wire up monitor in QemuSpiceOps.
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
This commit is contained in:
parent
864a024c69
commit
db5732c9cf
@ -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
|
||||
};
|
||||
|
||||
|
@ -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)
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user