[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 4/9] qmp: Clean up qmp_query_spice() #ifndef !CON
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v2 4/9] qmp: Clean up qmp_query_spice() #ifndef !CONFIG_SPICE dummy |
Date: |
Thu, 29 Jan 2015 10:27:33 +0100 |
QMP command query-spice exists only #ifdef CONFIG_SPICE. Due to QAPI
limitations, we need a dummy function anyway, but it's unreachable.
Our current dummy function goes out of its way to produce the exact
same error as the QMP core does for unknown commands. Cute, but both
unclean and unnecessary. Replace by straight abort().
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Gerd Hoffmann <address@hidden>
---
qmp.c | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/qmp.c b/qmp.c
index ef155ff..7f2d25a 100644
--- a/qmp.c
+++ b/qmp.c
@@ -137,14 +137,18 @@ VncInfo *qmp_query_vnc(Error **errp)
#endif
#ifndef CONFIG_SPICE
-/* If SPICE support is enabled, the "true" query-spice command is
- defined in the SPICE subsystem. Also note that we use a small
- trick to maintain query-spice's original behavior, which is not
- to be available in the namespace if SPICE is not compiled in */
+/*
+ * 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_input_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)
{
- error_set(errp, QERR_COMMAND_NOT_FOUND, "query-spice");
- return NULL;
+ abort();
};
#endif
--
1.9.3
- [Qemu-devel] [PATCH v2 0/9] qmp hmp balloon: Cleanups around error reporting, Markus Armbruster, 2015/01/29
- [Qemu-devel] [PATCH v2 2/9] qmp hmp: Improve error messages when SPICE is not in use, Markus Armbruster, 2015/01/29
- [Qemu-devel] [PATCH v2 9/9] balloon: Eliminate silly QERR_ macros, Markus Armbruster, 2015/01/29
- [Qemu-devel] [PATCH v2 5/9] qmp: Simplify recognition of capability negotiation command, Markus Armbruster, 2015/01/29
- [Qemu-devel] [PATCH v2 7/9] balloon: Inline qemu_balloon(), qemu_balloon_status(), Markus Armbruster, 2015/01/29
- [Qemu-devel] [PATCH v2 4/9] qmp: Clean up qmp_query_spice() #ifndef !CONFIG_SPICE dummy,
Markus Armbruster <=
- [Qemu-devel] [PATCH v2 6/9] qmp: Eliminate silly QERR_COMMAND_NOT_FOUND macro, Markus Armbruster, 2015/01/29
- [Qemu-devel] [PATCH v2 8/9] balloon: Factor out common "is balloon active" test, Markus Armbruster, 2015/01/29
- [Qemu-devel] [PATCH v2 3/9] hmp: Compile hmp_info_spice() only with CONFIG_SPICE, Markus Armbruster, 2015/01/29
- [Qemu-devel] [PATCH v2 1/9] qmp hmp: Factor out common "using spice" test, Markus Armbruster, 2015/01/29