[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 18/25] qga: don't disable fsfreeze commands if vss_init fails
From: |
Konstantin Kostiuk |
Subject: |
[PULL v2 18/25] qga: don't disable fsfreeze commands if vss_init fails |
Date: |
Tue, 23 Jul 2024 10:02:44 +0300 |
From: Daniel P. Berrangé <berrange@redhat.com>
The fsfreeze commands are already written to report an error if
vss_init() fails. Reporting a more specific error message is more
helpful than a generic "command is disabled" message, which cannot
between an admin config decision and lack of platform support.
Reviewed-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Konstantin Kostiuk <kkostiuk@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20240712132459.3974109-19-berrange@redhat.com>
Signed-off-by: Konstantin Kostiuk <kkostiuk@redhat.com>
---
qga/commands-win32.c | 18 +++---------------
qga/main.c | 4 ++++
2 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/qga/commands-win32.c b/qga/commands-win32.c
index 2533e4c748..5866cc2e3c 100644
--- a/qga/commands-win32.c
+++ b/qga/commands-win32.c
@@ -1203,7 +1203,7 @@ GuestFilesystemInfoList *qmp_guest_get_fsinfo(Error
**errp)
GuestFsfreezeStatus qmp_guest_fsfreeze_status(Error **errp)
{
if (!vss_initialized()) {
- error_setg(errp, QERR_UNSUPPORTED);
+ error_setg(errp, "fsfreeze not possible as VSS failed to initialize");
return 0;
}
@@ -1231,7 +1231,7 @@ int64_t qmp_guest_fsfreeze_freeze_list(bool
has_mountpoints,
Error *local_err = NULL;
if (!vss_initialized()) {
- error_setg(errp, QERR_UNSUPPORTED);
+ error_setg(errp, "fsfreeze not possible as VSS failed to initialize");
return 0;
}
@@ -1266,7 +1266,7 @@ int64_t qmp_guest_fsfreeze_thaw(Error **errp)
int i;
if (!vss_initialized()) {
- error_setg(errp, QERR_UNSUPPORTED);
+ error_setg(errp, "fsfreeze not possible as VSS failed to initialize");
return 0;
}
@@ -1961,18 +1961,6 @@ done:
/* add unsupported commands to the list of blocked RPCs */
GList *ga_command_init_blockedrpcs(GList *blockedrpcs)
{
- if (!vss_init(true)) {
- g_debug("vss_init failed, vss commands are going to be disabled");
- const char *list[] = {
- "guest-get-fsinfo", "guest-fsfreeze-status",
- "guest-fsfreeze-freeze", "guest-fsfreeze-thaw", NULL};
- char **p = (char **)list;
-
- while (*p) {
- blockedrpcs = g_list_append(blockedrpcs, g_strdup(*p++));
- }
- }
-
return blockedrpcs;
}
diff --git a/qga/main.c b/qga/main.c
index f4d5f15bb3..17b6ce18ac 100644
--- a/qga/main.c
+++ b/qga/main.c
@@ -1395,6 +1395,10 @@ static GAState *initialize_agent(GAConfig *config, int
socket_activation)
" '%s': %s", config->state_dir, strerror(errno));
return NULL;
}
+
+ if (!vss_init(true)) {
+ g_debug("vss_init failed, vss commands will not function");
+ }
#endif
if (ga_is_frozen(s)) {
--
2.45.2
- [PULL v2 08/25] qga: conditionalize schema for commands unsupported on Windows, (continued)
- [PULL v2 08/25] qga: conditionalize schema for commands unsupported on Windows, Konstantin Kostiuk, 2024/07/23
- [PULL v2 10/25] qga: conditionalize schema for commands requiring getifaddrs, Konstantin Kostiuk, 2024/07/23
- [PULL v2 11/25] qga: conditionalize schema for commands requiring linux/win32, Konstantin Kostiuk, 2024/07/23
- [PULL v2 12/25] qga: conditionalize schema for commands only supported on Windows, Konstantin Kostiuk, 2024/07/23
- [PULL v2 13/25] qga: conditionalize schema for commands requiring fsfreeze, Konstantin Kostiuk, 2024/07/23
- [PULL v2 14/25] qga: conditionalize schema for commands requiring fstrim, Konstantin Kostiuk, 2024/07/23
- [PULL v2 15/25] qga: conditionalize schema for commands requiring libudev, Konstantin Kostiuk, 2024/07/23
- [PULL v2 17/25] qga: conditionalize schema for commands not supported on other UNIX, Konstantin Kostiuk, 2024/07/23
- [PULL v2 16/25] qga: conditionalize schema for commands requiring utmpx, Konstantin Kostiuk, 2024/07/23
- [PULL v2 19/25] qga: move declare of QGAConfig struct to top of file, Konstantin Kostiuk, 2024/07/23
- [PULL v2 18/25] qga: don't disable fsfreeze commands if vss_init fails,
Konstantin Kostiuk <=
- [PULL v2 20/25] qga: remove pointless 'blockrpcs_key' variable, Konstantin Kostiuk, 2024/07/23
- [PULL v2 24/25] guest-agent: document allow-rpcs in config file section, Konstantin Kostiuk, 2024/07/23
- [PULL v2 23/25] qga/commands-posix: Make ga_wait_child() return boolean, Konstantin Kostiuk, 2024/07/23
- [PULL v2 22/25] qga: centralize logic for disabling/enabling commands, Konstantin Kostiuk, 2024/07/23
- [PULL v2 25/25] qga/linux: Add new api 'guest-network-get-route', Konstantin Kostiuk, 2024/07/23
- [PULL v2 21/25] qga: allow configuration file path via the cli, Konstantin Kostiuk, 2024/07/23
- Re: [PULL v2 00/25] Misc QEMU-GA patches 2024-07-22, Richard Henderson, 2024/07/23