[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 11/11] qapi: New -compat deprecated-input=crash
From: |
Markus Armbruster |
Subject: |
[PULL 11/11] qapi: New -compat deprecated-input=crash |
Date: |
Tue, 16 Mar 2021 11:33:08 +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>
Message-Id: <20210312153210.2810514-11-armbru@redhat.com>
---
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 fc24a58a9e..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: 6.0
##
{ 'enum': 'CompatPolicyInput',
- 'data': [ 'accept', 'reject' ] }
+ 'data': [ 'accept', 'reject', 'crash' ] }
##
# @CompatPolicyOutput:
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 f34d592eb1..2b5df64cdf 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
- [PULL 00/11] QAPI patches patches for 2021-03-16, Markus Armbruster, 2021/03/16
- [PULL 01/11] qemuutil: remove qemu_set_fd_handler duplicate symbol, Markus Armbruster, 2021/03/16
- [PULL 02/11] qemu-options: New -compat to set policy for deprecated interfaces, Markus Armbruster, 2021/03/16
- [PULL 03/11] qapi: Implement deprecated-output=hide for QMP command results, Markus Armbruster, 2021/03/16
- [PULL 10/11] qapi: Implement deprecated-input=reject for QMP command arguments, Markus Armbruster, 2021/03/16
- [PULL 05/11] qapi: Implement deprecated-output=hide for QMP event data, Markus Armbruster, 2021/03/16
- [PULL 11/11] qapi: New -compat deprecated-input=crash,
Markus Armbruster <=
- [PULL 07/11] qapi: Implement deprecated-output=hide for QMP introspection, Markus Armbruster, 2021/03/16
- [PULL 06/11] monitor: Drop query-qmp-schema 'gen': false hack, Markus Armbruster, 2021/03/16
- [PULL 08/11] test-util-sockets: Add stub for monitor_set_cur(), Markus Armbruster, 2021/03/16
- [PULL 09/11] qapi: Implement deprecated-input=reject for QMP commands, Markus Armbruster, 2021/03/16
- [PULL 04/11] qapi: Implement deprecated-output=hide for QMP events, Markus Armbruster, 2021/03/16
- Re: [PULL 00/11] QAPI patches patches for 2021-03-16, Peter Maydell, 2021/03/17