[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 34/34] qapi: New -compat deprecated-input=crash
From: |
Markus Armbruster |
Subject: |
[PATCH v4 34/34] qapi: New -compat deprecated-input=crash |
Date: |
Tue, 17 Mar 2020 12:54:59 +0100 |
Policy "crash" calls abort() when deprecated input is received.
Bugs in integration tests may mask the error from policy "reject".
Provide a larger hammer: crash outright. Masking that seems unlikely.
Signed-off-by: Markus Armbruster <address@hidden>
---
qapi/compat.json | 3 ++-
qapi/qmp-dispatch.c | 1 +
qapi/qobject-input-visitor.c | 1 +
qemu-options.hx | 4 +++-
4 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/qapi/compat.json b/qapi/compat.json
index fd6f8e932c..ec24567639 100644
--- a/qapi/compat.json
+++ b/qapi/compat.json
@@ -11,11 +11,12 @@
#
# @accept: Accept silently
# @reject: Reject with an error
+# @crash: abort() the process
#
# Since: 5.0
##
{ 'enum': 'CompatPolicyInput',
- 'data': [ 'accept', 'reject' ] }
+ 'data': [ 'accept', 'reject', 'crash' ] }
##
# @CompatPolicyOutput:
diff --git a/qapi/qmp-dispatch.c b/qapi/qmp-dispatch.c
index 18d62cd83b..90335a1b7f 100644
--- a/qapi/qmp-dispatch.c
+++ b/qapi/qmp-dispatch.c
@@ -139,6 +139,7 @@ QDict *qmp_dispatch(QmpCommandList *cmds, QObject *request,
"Deprecated command %s disabled by policy",
command);
goto out;
+ case COMPAT_POLICY_INPUT_CRASH:
default:
abort();
}
diff --git a/qapi/qobject-input-visitor.c b/qapi/qobject-input-visitor.c
index 6ea93f5a7a..a74c901be9 100644
--- a/qapi/qobject-input-visitor.c
+++ b/qapi/qobject-input-visitor.c
@@ -654,6 +654,7 @@ static bool qobject_input_deprecated(Visitor *v, const char
*name,
error_setg(errp, "Deprecated parameter '%s' disabled by policy",
name);
return false;
+ case COMPAT_POLICY_INPUT_CRASH:
default:
abort();
}
diff --git a/qemu-options.hx b/qemu-options.hx
index 263d18d63a..7052d6e802 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -3358,7 +3358,7 @@ DEFHEADING()
DEFHEADING(Debug/Expert options:)
DEF("compat", HAS_ARG, QEMU_OPTION_compat,
- "-compat
[deprecated-input=accept|reject][,deprecated-output=accept|hide]\n"
+ "-compat
[deprecated-input=accept|reject|crash][,deprecated-output=accept|hide]\n"
" Policy for handling deprecated management interfaces\n",
QEMU_ARCH_ALL)
SRST
@@ -3369,6 +3369,8 @@ SRST
Accept deprecated commands and arguments
``deprecated-input=reject``
Reject deprecated commands and arguments
+ ``deprecated-input=crash``
+ Crash on deprecated command
``deprecated-output=accept`` (default)
Emit deprecated command results and events
``deprecated-output=hide``
--
2.21.1
- [PATCH v4 28/34] qapi: Implement deprecated-output=hide for QMP command results, (continued)
- [PATCH v4 28/34] qapi: Implement deprecated-output=hide for QMP command results, Markus Armbruster, 2020/03/17
- [PATCH v4 25/34] qapi: New special feature flag "deprecated", Markus Armbruster, 2020/03/17
- [PATCH v4 13/34] qapi: Consistently put @features parameter right after @ifcond, Markus Armbruster, 2020/03/17
- [PATCH v4 29/34] qapi: Implement deprecated-output=hide for QMP events, Markus Armbruster, 2020/03/17
- [PATCH v4 34/34] qapi: New -compat deprecated-input=crash,
Markus Armbruster <=
- [PATCH v4 19/34] qapi/schema: Call QAPIDoc.connect_member() in just one place, Markus Armbruster, 2020/03/17
- [PATCH v4 26/34] qapi: Mark deprecated QMP parts with feature 'deprecated', Markus Armbruster, 2020/03/17
- [PATCH v4 17/34] qapi/schema: Reorder classes so related ones are together, Markus Armbruster, 2020/03/17
- [PATCH v4 31/34] qapi: Implement deprecated-output=hide for QMP introspection, Markus Armbruster, 2020/03/17
- [PATCH v4 33/34] qapi: Implement deprecated-input=reject for QMP command arguments, Markus Armbruster, 2020/03/17
- [PATCH v4 12/34] qapi: Add feature flags to remaining definitions, Markus Armbruster, 2020/03/17
- [PATCH v4 20/34] qapi: Add feature flags to struct members, Markus Armbruster, 2020/03/17
- [PATCH v4 15/34] qapi/introspect: Factor out _make_tree(), Markus Armbruster, 2020/03/17