From patchwork Thu Feb 27 16:31:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 11408881 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EB619930 for ; Thu, 27 Feb 2020 16:33:20 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C0D58246A1 for ; Thu, 27 Feb 2020 16:33:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="NKkatqTL" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C0D58246A1 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:34232 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j7M6B-0006KN-UN for patchwork-qemu-devel@patchwork.kernel.org; Thu, 27 Feb 2020 11:33:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40936) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j7M54-0004VS-Ej for qemu-devel@nongnu.org; Thu, 27 Feb 2020 11:32:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j7M53-000357-Ck for qemu-devel@nongnu.org; Thu, 27 Feb 2020 11:32:10 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:54976 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j7M53-00034y-8H for qemu-devel@nongnu.org; Thu, 27 Feb 2020 11:32:09 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582821128; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nQDBNrecZ++ehAWaj148iqa/qkCuUZmbV37u4dgQJEQ=; b=NKkatqTLaoYE+r3vLEDno9na4wTKJ2JPWJzZrckja4LTYiqk+XVaiodS4frQ8iwhBMWSbs FZ044u21gnWb87U7YR9zBl6fM3KWMFpmL6k/J1RLpU5gYIw4i2b2/pM3cZSaHmHgdEv+0P nlwl386HAL8sFxxnAHaV1xtuomakDTM= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-428-CKf8VmUSOKCDrLXBSzYO3g-1; Thu, 27 Feb 2020 11:32:05 -0500 X-MC-Unique: CKf8VmUSOKCDrLXBSzYO3g-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 14C3C802563; Thu, 27 Feb 2020 16:32:04 +0000 (UTC) Received: from x1w.redhat.com (ovpn-205-195.brq.redhat.com [10.40.205.195]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6F62A6E3EE; Thu, 27 Feb 2020 16:32:01 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 6/6] qga: Improve error report by calling error_setg_win32() Date: Thu, 27 Feb 2020 17:31:01 +0100 Message-Id: <20200227163101.414-7-philmd@redhat.com> In-Reply-To: <20200227163101.414-1-philmd@redhat.com> References: <20200227163101.414-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.61 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Stefan Weil , Markus Armbruster , Michael Roth , =?utf-8?b?VG9tw6HFoSBHb2xlbWJp?= =?utf-8?b?b3Zza8O9?= , Stefan Hajnoczi , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Use error_setg_win32() which adds a hint similar to strerror(errno)). Signed-off-by: Philippe Mathieu-Daudé --- 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"); } } @@ -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);