[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v2 11/12] qmp: update qmp_query_spice fallback
From: |
Markus Armbruster |
Subject: |
Re: [Qemu-devel] [PATCH v2 11/12] qmp: update qmp_query_spice fallback |
Date: |
Fri, 05 Aug 2016 15:40:37 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) |
address@hidden writes:
> From: Marc-André Lureau <address@hidden>
>
> There are a few commands that are undef #ifdef conditions in
under #ifdef
> qmp-commands.hx. Move all the qmp_query_spice fallback in the same
> location, return an error and update the comment.
>
> Signed-off-by: Marc-André Lureau <address@hidden>
> ---
> monitor.c | 14 ++++++++++++++
> qmp.c | 16 ----------------
> 2 files changed, 14 insertions(+), 16 deletions(-)
>
> diff --git a/monitor.c b/monitor.c
> index c87089f..46966d5 100644
> --- a/monitor.c
> +++ b/monitor.c
> @@ -4048,6 +4048,20 @@ QemuOptsList qemu_mon_opts = {
> },
> };
>
> +/*
> + * the QAPI schema is blissfully unaware #ifdef FOO commands, and the
> + * QAPI code generator happily generates a dead qmp_marshal_foo_cmd()
> + * that calls qmp_foo_cmd(). Provide it one, or else linking fails.
> + * FIXME Educate the QAPI schema on #ifdef commands.
> + */
> +#ifndef CONFIG_SPICE
> +SpiceInfo *qmp_query_spice(Error **errp)
> +{
> + error_setg(errp, QERR_FEATURE_DISABLED, "spice");
> + return NULL;
Why do you change from abort() to error_setg()?
> +};
> +#endif
> +
> #ifndef TARGET_I386
> void qmp_rtc_reset_reinjection(Error **errp)
> {
> diff --git a/qmp.c b/qmp.c
> index b6d531e..884d1ab 100644
> --- a/qmp.c
> +++ b/qmp.c
> @@ -161,22 +161,6 @@ VncInfo2List *qmp_query_vnc_servers(Error **errp)
> };
> #endif
>
> -#ifndef CONFIG_SPICE
> -/*
> - * qmp-commands.hx ensures that QMP command query-spice exists only
> - * #ifdef CONFIG_SPICE. Necessary for an accurate query-commands
> - * result. However, the QAPI schema is blissfully unaware of that,
> - * and the QAPI code generator happily generates a dead
> - * qmp_marshal_query_spice() that calls qmp_query_spice(). Provide it
> - * one, or else linking fails. FIXME Educate the QAPI schema on
> - * CONFIG_SPICE.
> - */
> -SpiceInfo *qmp_query_spice(Error **errp)
> -{
> - abort();
> -};
> -#endif
> -
> void qmp_cont(Error **errp)
> {
> Error *local_err = NULL;
- Re: [Qemu-devel] [PATCH v2 11/12] qmp: update qmp_query_spice fallback,
Markus Armbruster <=