[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 10/10] qapi: New -compat deprecated-input=crash
From: |
Markus Armbruster |
Subject: |
[PATCH v6 10/10] qapi: New -compat deprecated-input=crash |
Date: |
Fri, 12 Mar 2021 16:32:10 +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 <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
qapi/compat.json | 9 +++++----
qapi/qmp-dispatch.c | 1 +
qapi/qobject-input-visitor.c | 1 +
qemu-options.hx | 4 +++-
4 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/qapi/compat.json b/qapi/compat.json
index d2c02a21aa..ae3afc22df 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.2
+# Since: 6.0
##
{ 'enum': 'CompatPolicyInput',
- 'data': [ 'accept', 'reject' ] }
+ 'data': [ 'accept', 'reject', 'crash' ] }
##
# @CompatPolicyOutput:
@@ -25,7 +26,7 @@
# @accept: Pass on unchanged
# @hide: Filter out
#
-# Since: 5.2
+# Since: 6.0
##
{ 'enum': 'CompatPolicyOutput',
'data': [ 'accept', 'hide' ] }
@@ -44,7 +45,7 @@
# @deprecated-input: how to handle deprecated input (default 'accept')
# @deprecated-output: how to handle deprecated output (default 'accept')
#
-# Since: 5.2
+# Since: 6.0
##
{ 'struct': 'CompatPolicy',
'data': { '*deprecated-input': 'CompatPolicyInput',
diff --git a/qapi/qmp-dispatch.c b/qapi/qmp-dispatch.c
index cbc4452341..12657d635e 100644
--- a/qapi/qmp-dispatch.c
+++ b/qapi/qmp-dispatch.c
@@ -167,6 +167,7 @@ QDict *qmp_dispatch(const 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 1b8fa1f2f6..baad0dcd3c 100644
--- a/qapi/qobject-input-visitor.c
+++ b/qapi/qobject-input-visitor.c
@@ -676,6 +676,7 @@ static bool qobject_input_deprecated_accept(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 2be2feed32..165fa048e9 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -3471,7 +3471,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
@@ -3482,6 +3482,8 @@ SRST
Accept deprecated commands and arguments
``deprecated-input=reject``
Reject deprecated commands and arguments
+ ``deprecated-input=crash``
+ Crash on deprecated commands and arguments
``deprecated-output=accept`` (default)
Emit deprecated command results and events
``deprecated-output=hide``
--
2.26.2
- Re: [PATCH v6 08/10] qapi: Implement deprecated-input=reject for QMP commands, (continued)
- [PATCH v6 02/10] qapi: Implement deprecated-output=hide for QMP command results, Markus Armbruster, 2021/03/12
- [PATCH v6 07/10] test-util-sockets: Add stub for monitor_set_cur(), Markus Armbruster, 2021/03/12
- [PATCH v6 05/10] monitor: Drop query-qmp-schema 'gen': false hack, Markus Armbruster, 2021/03/12
- [PATCH v6 10/10] qapi: New -compat deprecated-input=crash,
Markus Armbruster <=
- [PATCH v6 06/10] qapi: Implement deprecated-output=hide for QMP introspection, Markus Armbruster, 2021/03/12
- [PATCH v6 09/10] qapi: Implement deprecated-input=reject for QMP command arguments, Markus Armbruster, 2021/03/12
- [PATCH v6 03/10] qapi: Implement deprecated-output=hide for QMP events, Markus Armbruster, 2021/03/12
- Re: [PATCH v6 00/10] Configurable policy for handling deprecated interfaces, Markus Armbruster, 2021/03/18