[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 16/25] qga: conditionalize schema for commands requiring utmpx
From: |
Konstantin Kostiuk |
Subject: |
[PULL 16/25] qga: conditionalize schema for commands requiring utmpx |
Date: |
Mon, 22 Jul 2024 10:01:13 +0300 |
From: Daniel P. Berrangé <berrange@redhat.com>
Rather than creating stubs for every command that just return
QERR_UNSUPPORTED, use 'if' conditions in the QAPI schema to
fully exclude generation of the get-users command on POSIX
platforms lacking required APIs.
The command will be rejected at QMP dispatch time instead,
avoiding reimplementing rejection by blocking the stub commands.
This changes the error message for affected commands from
{"class": "CommandNotFound", "desc": "Command FOO has been disabled"}
to
{"class": "CommandNotFound", "desc": "The command FOO has not been found"}
This has the additional benefit that the QGA protocol reference
now documents what conditions enable use of the command.
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Konstantin Kostiuk <kkostiuk@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>
Message-ID: <20240712132459.3974109-17-berrange@redhat.com>
Signed-off-by: Konstantin Kostiuk <kkostiuk@redhat.com>
---
qga/commands-posix.c | 10 +---------
qga/qapi-schema.json | 6 ++++--
2 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/qga/commands-posix.c b/qga/commands-posix.c
index d92fa0ec87..a353f64ae6 100644
--- a/qga/commands-posix.c
+++ b/qga/commands-posix.c
@@ -1212,15 +1212,7 @@ GuestUserList *qmp_guest_get_users(Error **errp)
return head;
}
-#else
-
-GuestUserList *qmp_guest_get_users(Error **errp)
-{
- error_setg(errp, QERR_UNSUPPORTED);
- return NULL;
-}
-
-#endif
+#endif /* HAVE_UTMPX */
/* Replace escaped special characters with their real values. The replacement
* is done in place -- returned value is in the original string.
diff --git a/qga/qapi-schema.json b/qga/qapi-schema.json
index cf1ad42519..0662a68c43 100644
--- a/qga/qapi-schema.json
+++ b/qga/qapi-schema.json
@@ -1414,7 +1414,8 @@
# Since: 2.10
##
{ 'struct': 'GuestUser',
- 'data': { 'user': 'str', 'login-time': 'number', '*domain': 'str' } }
+ 'data': { 'user': 'str', 'login-time': 'number', '*domain': 'str' },
+ 'if': { 'any': ['CONFIG_WIN32', 'HAVE_UTMPX' ] } }
##
# @guest-get-users:
@@ -1426,7 +1427,8 @@
# Since: 2.10
##
{ 'command': 'guest-get-users',
- 'returns': ['GuestUser'] }
+ 'returns': ['GuestUser'],
+ 'if': { 'any': ['CONFIG_WIN32', 'HAVE_UTMPX' ] } }
##
# @GuestTimezone:
--
2.45.2
- [PULL 11/25] qga: conditionalize schema for commands requiring linux/win32, (continued)
- [PULL 11/25] qga: conditionalize schema for commands requiring linux/win32, Konstantin Kostiuk, 2024/07/22
- [PULL 07/25] qga: move CONFIG_FSFREEZE/TRIM to be meson defined options, Konstantin Kostiuk, 2024/07/22
- [PULL 15/25] qga: conditionalize schema for commands requiring libudev, Konstantin Kostiuk, 2024/07/22
- [PULL 12/25] qga: conditionalize schema for commands only supported on Windows, Konstantin Kostiuk, 2024/07/22
- [PULL 08/25] qga: conditionalize schema for commands unsupported on Windows, Konstantin Kostiuk, 2024/07/22
- [PULL 21/25] qga: allow configuration file path via the cli, Konstantin Kostiuk, 2024/07/22
- [PULL 17/25] qga: conditionalize schema for commands not supported on other UNIX, Konstantin Kostiuk, 2024/07/22
- [PULL 22/25] qga: centralize logic for disabling/enabling commands, Konstantin Kostiuk, 2024/07/22
- [PULL 09/25] qga: conditionalize schema for commands unsupported on non-Linux POSIX, Konstantin Kostiuk, 2024/07/22
- [PULL 13/25] qga: conditionalize schema for commands requiring fsfreeze, Konstantin Kostiuk, 2024/07/22
- [PULL 16/25] qga: conditionalize schema for commands requiring utmpx,
Konstantin Kostiuk <=
- [PULL 20/25] qga: remove pointless 'blockrpcs_key' variable, Konstantin Kostiuk, 2024/07/22
- [PULL 10/25] qga: conditionalize schema for commands requiring getifaddrs, Konstantin Kostiuk, 2024/07/22
- [PULL 14/25] qga: conditionalize schema for commands requiring fstrim, Konstantin Kostiuk, 2024/07/22
- [PULL 18/25] qga: don't disable fsfreeze commands if vss_init fails, Konstantin Kostiuk, 2024/07/22
- [PULL 25/25] qga/linux: Add new api 'guest-network-get-route', Konstantin Kostiuk, 2024/07/22
- [PULL 24/25] guest-agent: document allow-rpcs in config file section, Konstantin Kostiuk, 2024/07/22
- [PULL 19/25] qga: move declare of QGAConfig struct to top of file, Konstantin Kostiuk, 2024/07/22
- [PULL 23/25] qga/commands-posix: Make ga_wait_child() return boolean, Konstantin Kostiuk, 2024/07/22
- Re: [PULL 00/25] Misc QEMU-GA patches 2024-07-22, Richard Henderson, 2024/07/22