From patchwork Thu Feb 27 16:30:59 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: 11408889 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 7050C17E0 for ; Thu, 27 Feb 2020 16:36:34 +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 459F52469C for ; Thu, 27 Feb 2020 16:36:34 +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="BhgehElv" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 459F52469C 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]:34282 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j7M9J-0001py-GS for patchwork-qemu-devel@patchwork.kernel.org; Thu, 27 Feb 2020 11:36:33 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40910) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j7M50-0004NX-RI for qemu-devel@nongnu.org; Thu, 27 Feb 2020 11:32:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j7M4z-00033M-T8 for qemu-devel@nongnu.org; Thu, 27 Feb 2020 11:32:06 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:21885 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j7M4z-00032s-5d for qemu-devel@nongnu.org; Thu, 27 Feb 2020 11:32:05 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582821123; 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=P74SiNUxpKL8ZPS0To1187cVvGqPWjuWELUewBJjUJo=; b=BhgehElveBWPfI8QmiVjfH5eqq376b5cA+aRNHHGnGcBAfPmrGP8GYAzd1x5rc2/2yhtxO 6WCnin1S0p+JNaD2zkzBDmcbUeu0Nrc8EXW30dnOvlsrBpk0YAwEpq4Gh004CyYWpT4ROO DNmKHUXXqIdcTWcxAHAZW6lxgwAzXTo= 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-146-wTJ4Is98OBWftlPy7j-zKQ-1; Thu, 27 Feb 2020 11:31:58 -0500 X-MC-Unique: wTJ4Is98OBWftlPy7j-zKQ-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 DBB0C802560; Thu, 27 Feb 2020 16:31:57 +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 A4F1C6E3EE; Thu, 27 Feb 2020 16:31:52 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 4/6] util/osdep: Improve error report by calling error_setg_win32() Date: Thu, 27 Feb 2020 17:30:59 +0100 Message-Id: <20200227163101.414-5-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.120 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é Reviewed-by: Marc-André Lureau --- util/osdep.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/util/osdep.c b/util/osdep.c index ef40ae512a..144e217cb9 100644 --- a/util/osdep.c +++ b/util/osdep.c @@ -82,8 +82,8 @@ static int qemu_mprotect__osdep(void *addr, size_t size, int prot) DWORD old_protect; if (!VirtualProtect(addr, size, prot, &old_protect)) { - error_report("%s: VirtualProtect failed with error code %ld", - __func__, GetLastError()); + g_autofree gchar *emsg = g_win32_error_message(GetLastError()); + error_report("%s: VirtualProtect failed: %s", __func__, emsg); return -1; } return 0; @@ -506,12 +506,12 @@ int socket_init(void) { #ifdef _WIN32 WSADATA Data; - int ret, err; + int ret; ret = WSAStartup(MAKEWORD(2, 2), &Data); if (ret != 0) { - err = WSAGetLastError(); - error_report("WSAStartup: %d", err); + g_autofree gchar *emsg = g_win32_error_message(WSAGetLastError()); + error_report("WSAStartup: %s", emsg); return -1; } atexit(socket_cleanup);