[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v2 6/6] qga: Improve error report by calling error_setg_win32
From: |
Marc-André Lureau |
Subject: |
Re: [PATCH v2 6/6] qga: Improve error report by calling error_setg_win32() |
Date: |
Thu, 27 Feb 2020 18:20:50 +0100 |
Hi
On Thu, Feb 27, 2020 at 5:32 PM Philippe Mathieu-Daudé
<address@hidden> wrote:
>
> Use error_setg_win32() which adds a hint similar to strerror(errno)).
>
> Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
> ---
> qga/channel-win32.c | 3 ++-
> qga/commands-win32.c | 6 +++---
> 2 files changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/qga/channel-win32.c b/qga/channel-win32.c
> index 774205e017..4f04868a76 100644
> --- a/qga/channel-win32.c
> +++ b/qga/channel-win32.c
> @@ -308,7 +308,8 @@ static gboolean ga_channel_open(GAChannel *c,
> GAChannelMethod method,
> }
>
> if (method == GA_CHANNEL_ISA_SERIAL &&
> !SetCommTimeouts(c->handle,&comTimeOut)) {
> - g_critical("error setting timeout for com port: %lu",GetLastError());
> + g_autofree gchar *emsg = g_win32_error_message(GetLastError());
> + g_critical("error setting timeout for com port: %s", emsg);
> CloseHandle(c->handle);
> return false;
> }
> diff --git a/qga/commands-win32.c b/qga/commands-win32.c
> index 2461fd19bf..8e1f32ea23 100644
> --- a/qga/commands-win32.c
> +++ b/qga/commands-win32.c
> @@ -315,8 +315,7 @@ void qmp_guest_shutdown(bool has_mode, const char *mode,
> Error **errp)
> }
>
> if (!ExitWindowsEx(shutdown_flag, SHTDN_REASON_FLAG_PLANNED)) {
> - slog("guest-shutdown failed: %lu", GetLastError());
> - error_setg(errp, QERR_UNDEFINED_ERROR);
> + error_setg_win32(errp, GetLastError(), "guest-shutdown failed");
did you drop the slog() intentionally?
> }
> }
>
> @@ -1319,7 +1318,8 @@ static DWORD WINAPI do_suspend(LPVOID opaque)
> DWORD ret = 0;
>
> if (!SetSuspendState(*mode == GUEST_SUSPEND_MODE_DISK, TRUE, TRUE)) {
> - slog("failed to suspend guest, %lu", GetLastError());
> + g_autofree gchar *emsg = g_win32_error_message(GetLastError());
> + slog("failed to suspend guest: %s", emsg);
> ret = -1;
> }
> g_free(mode);
> --
> 2.21.1
>
- [PATCH v2 2/6] util: Replace fprintf(stderr, "*\n" with error_report(), (continued)
- [PATCH v2 3/6] util/oslib-win32: Improve error report by calling error_setg_win32(), Philippe Mathieu-Daudé, 2020/02/27
- [PATCH v2 5/6] qga: Fix a memory leak, Philippe Mathieu-Daudé, 2020/02/27
- [PATCH v2 4/6] util/osdep: Improve error report by calling error_setg_win32(), Philippe Mathieu-Daudé, 2020/02/27
- [PATCH v2 6/6] qga: Improve error report by calling error_setg_win32(), Philippe Mathieu-Daudé, 2020/02/27
- Re: [PATCH v2 6/6] qga: Improve error report by calling error_setg_win32(),
Marc-André Lureau <=