| Message ID | 20240514105829.729342-2-armbru@redhat.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | error: Eliminate QERR_QGA_COMMAND_FAILED | expand |
On 14/5/24 12:58, Markus Armbruster wrote: > When guest-set-user-password's argument @password can't be converted > from UTF-8 to UTF-16, we report something like > > Guest agent command failed, error was 'Invalid sequence in conversion input' > > Improve this to > > can't convert 'password' to UTF-16: Invalid sequence in conversion input > > Likewise for argument @username, and guest-file-open argument @path, > even though I'm not sure you can actually get invalid input past the > QMP core there. > > Signed-off-by: Markus Armbruster <armbru@redhat.com> > --- > qga/commands-win32.c | 17 +++++++++-------- > 1 file changed, 9 insertions(+), 8 deletions(-) Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Konstantin Kostiuk <kkostiuk@redhat.com> On Tue, May 14, 2024 at 2:03 PM Markus Armbruster <armbru@redhat.com> wrote: > When guest-set-user-password's argument @password can't be converted > from UTF-8 to UTF-16, we report something like > > Guest agent command failed, error was 'Invalid sequence in conversion > input' > > Improve this to > > can't convert 'password' to UTF-16: Invalid sequence in conversion > input > > Likewise for argument @username, and guest-file-open argument @path, > even though I'm not sure you can actually get invalid input past the > QMP core there. > > Signed-off-by: Markus Armbruster <armbru@redhat.com> > --- > qga/commands-win32.c | 17 +++++++++-------- > 1 file changed, 9 insertions(+), 8 deletions(-) > > diff --git a/qga/commands-win32.c b/qga/commands-win32.c > index 6fee0e1e6f..ed31077457 100644 > --- a/qga/commands-win32.c > +++ b/qga/commands-win32.c > @@ -217,6 +217,9 @@ int64_t qmp_guest_file_open(const char *path, const > char *mode, Error **errp) > > w_path = g_utf8_to_utf16(path, -1, NULL, NULL, &gerr); > if (!w_path) { > + error_setg(errp, "can't convert 'path' to UTF-16: %s", > + gerr->message); > + g_error_free(gerr); > goto done; > } > > @@ -244,10 +247,6 @@ int64_t qmp_guest_file_open(const char *path, const > char *mode, Error **errp) > slog("guest-file-open, handle: % " PRId64, fd); > > done: > - if (gerr) { > - error_setg(errp, QERR_QGA_COMMAND_FAILED, gerr->message); > - g_error_free(gerr); > - } > g_free(w_path); > return fd; > } > @@ -1946,11 +1945,17 @@ void qmp_guest_set_user_password(const char > *username, > > user = g_utf8_to_utf16(username, -1, NULL, NULL, &gerr); > if (!user) { > + error_setg(errp, "can't convert 'username' to UTF-16: %s", > + gerr->message); > + g_error_free(gerr); > goto done; > } > > wpass = g_utf8_to_utf16(rawpasswddata, -1, NULL, NULL, &gerr); > if (!wpass) { > + error_setg(errp, "can't convert 'password' to UTF-16: %s", > + gerr->message); > + g_error_free(gerr); > goto done; > } > > @@ -1966,10 +1971,6 @@ void qmp_guest_set_user_password(const char > *username, > } > > done: > - if (gerr) { > - error_setg(errp, QERR_QGA_COMMAND_FAILED, gerr->message); > - g_error_free(gerr); > - } > g_free(user); > g_free(wpass); > g_free(rawpasswddata); > -- > 2.45.0 > >
diff --git a/qga/commands-win32.c b/qga/commands-win32.c index 6fee0e1e6f..ed31077457 100644 --- a/qga/commands-win32.c +++ b/qga/commands-win32.c @@ -217,6 +217,9 @@ int64_t qmp_guest_file_open(const char *path, const char *mode, Error **errp) w_path = g_utf8_to_utf16(path, -1, NULL, NULL, &gerr); if (!w_path) { + error_setg(errp, "can't convert 'path' to UTF-16: %s", + gerr->message); + g_error_free(gerr); goto done; } @@ -244,10 +247,6 @@ int64_t qmp_guest_file_open(const char *path, const char *mode, Error **errp) slog("guest-file-open, handle: % " PRId64, fd); done: - if (gerr) { - error_setg(errp, QERR_QGA_COMMAND_FAILED, gerr->message); - g_error_free(gerr); - } g_free(w_path); return fd; } @@ -1946,11 +1945,17 @@ void qmp_guest_set_user_password(const char *username, user = g_utf8_to_utf16(username, -1, NULL, NULL, &gerr); if (!user) { + error_setg(errp, "can't convert 'username' to UTF-16: %s", + gerr->message); + g_error_free(gerr); goto done; } wpass = g_utf8_to_utf16(rawpasswddata, -1, NULL, NULL, &gerr); if (!wpass) { + error_setg(errp, "can't convert 'password' to UTF-16: %s", + gerr->message); + g_error_free(gerr); goto done; } @@ -1966,10 +1971,6 @@ void qmp_guest_set_user_password(const char *username, } done: - if (gerr) { - error_setg(errp, QERR_QGA_COMMAND_FAILED, gerr->message); - g_error_free(gerr); - } g_free(user); g_free(wpass); g_free(rawpasswddata);
When guest-set-user-password's argument @password can't be converted from UTF-8 to UTF-16, we report something like Guest agent command failed, error was 'Invalid sequence in conversion input' Improve this to can't convert 'password' to UTF-16: Invalid sequence in conversion input Likewise for argument @username, and guest-file-open argument @path, even though I'm not sure you can actually get invalid input past the QMP core there. Signed-off-by: Markus Armbruster <armbru@redhat.com> --- qga/commands-win32.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)