From nobody Mon Nov 25 12:22:28 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1715684372; cv=none; d=zohomail.com; s=zohoarc; b=Wl/h9vk09jeH/0MA+KifSSuKoVMGenSBJCSVbEKTcFw3drZO3dMPLySD7u7WCb+c9oBjalMW7+2mJQOtDJ2kIGttNzIVv2u/WQ3fuLSNQmMNWAJ5ecVtqCjWzeZnKngMHsASnsaUGs4rjzwWyrcWfAqzWLUGbDlXQQzDlknyH4o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1715684372; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=vkyhECfPv7q6ovRdUvNv/KqL612ij4/6raij8nRUqzI=; b=oAZjhDkOC/Pg09yxnJCPLVYpLidXF/vF6rgacs/FGJxyIEDpkbVlL7QasvjwLd45zBvf9zTufBfFHyY/hv0knZkmlTM4iskhFQtBbkTsuWTAo3G+GTkL+C/yrTTUCTIlPeX/bANVhp/3tJjJ34Fq/F9YW51GHy/+fju3sUfdDXo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1715684372768211.98172939196843; Tue, 14 May 2024 03:59:32 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s6pri-0006ld-Er; Tue, 14 May 2024 06:58:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s6prf-0006kd-WC for qemu-devel@nongnu.org; Tue, 14 May 2024 06:58:36 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s6pre-0004ha-A5 for qemu-devel@nongnu.org; Tue, 14 May 2024 06:58:35 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-104-5vtmxdnKPBGZRv_8JTvueQ-1; Tue, 14 May 2024 06:58:30 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 716C08030B4; Tue, 14 May 2024 10:58:30 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.193.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 14D61C15BB9; Tue, 14 May 2024 10:58:30 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 0CE8621E5E74; Tue, 14 May 2024 12:58:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1715684312; 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=vkyhECfPv7q6ovRdUvNv/KqL612ij4/6raij8nRUqzI=; b=BU42e9JRDXm09ueRehc7DOTbQQUQvh+TTj+smV4uUlYHZzdmckyROG0cJBSk+JLkEwxTUK i58X83lw7PCsYwzsLw+S12OfahoxvGalGq62ZMJWUycmLIF2iBEyurjoZmJQbHGiNxIy/0 uQZAuAwjdkyobLUamAs4XaPI9TqFhg4= X-MC-Unique: 5vtmxdnKPBGZRv_8JTvueQ-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: philmd@linaro.org, kkostiuk@redhat.com, michael.roth@amd.com Subject: [PATCH 2/3] qga: Shorten several error messages Date: Tue, 14 May 2024 12:58:27 +0200 Message-ID: <20240514105829.729342-3-armbru@redhat.com> In-Reply-To: <20240514105829.729342-1-armbru@redhat.com> References: <20240514105829.729342-1-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.974, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1715684373843100001 Some, but not all error messages are of the form Guest agent command failed, error was '' For instance, command guest-exec can fail with an error message like Guest agent command failed, error was 'Failed to execute child process = =E2=80=9C/bin/invalid-cmd42=E2=80=9D (No such file or directory)' Shorten this to just just the actual error message. The guest-exec example becomes Failed to execute child process =E2=80=9C/bin/invalid-cmd42=E2=80=9D (N= o such file or directory) Signed-off-by: Markus Armbruster Reviewed-by: Konstantin Kostiuk Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- qga/commands-win32.c | 24 ++++++++---------------- qga/commands.c | 5 ++--- 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/qga/commands-win32.c b/qga/commands-win32.c index ed31077457..0d1b836e87 100644 --- a/qga/commands-win32.c +++ b/qga/commands-win32.c @@ -278,8 +278,7 @@ static void acquire_privilege(const char *name, Error *= *errp) TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY, &token)) { if (!LookupPrivilegeValue(NULL, name, &priv.Privileges[0].Luid)) { - error_setg(errp, QERR_QGA_COMMAND_FAILED, - "no luid for requested privilege"); + error_setg(errp, "no luid for requested privilege"); goto out; } =20 @@ -287,14 +286,12 @@ static void acquire_privilege(const char *name, Error= **errp) priv.Privileges[0].Attributes =3D SE_PRIVILEGE_ENABLED; =20 if (!AdjustTokenPrivileges(token, FALSE, &priv, 0, NULL, 0)) { - error_setg(errp, QERR_QGA_COMMAND_FAILED, - "unable to acquire requested privilege"); + error_setg(errp, "unable to acquire requested privilege"); goto out; } =20 } else { - error_setg(errp, QERR_QGA_COMMAND_FAILED, - "failed to open privilege token"); + error_setg(errp, "failed to open privilege token"); } =20 out: @@ -308,8 +305,7 @@ static void execute_async(DWORD WINAPI (*func)(LPVOID),= LPVOID opaque, { HANDLE thread =3D CreateThread(NULL, 0, func, opaque, 0, NULL); if (!thread) { - error_setg(errp, QERR_QGA_COMMAND_FAILED, - "failed to dispatch asynchronous command"); + error_setg(errp, "failed to dispatch asynchronous command"); } } =20 @@ -1418,22 +1414,19 @@ static void check_suspend_mode(GuestSuspendMode mod= e, Error **errp) =20 ZeroMemory(&sys_pwr_caps, sizeof(sys_pwr_caps)); if (!GetPwrCapabilities(&sys_pwr_caps)) { - error_setg(errp, QERR_QGA_COMMAND_FAILED, - "failed to determine guest suspend capabilities"); + error_setg(errp, "failed to determine guest suspend capabilities"); return; } =20 switch (mode) { case GUEST_SUSPEND_MODE_DISK: if (!sys_pwr_caps.SystemS4) { - error_setg(errp, QERR_QGA_COMMAND_FAILED, - "suspend-to-disk not supported by OS"); + error_setg(errp, "suspend-to-disk not supported by OS"); } break; case GUEST_SUSPEND_MODE_RAM: if (!sys_pwr_caps.SystemS3) { - error_setg(errp, QERR_QGA_COMMAND_FAILED, - "suspend-to-ram not supported by OS"); + error_setg(errp, "suspend-to-ram not supported by OS"); } break; default: @@ -2175,8 +2168,7 @@ static void ga_get_win_version(RTL_OSVERSIONINFOEXW *= info, Error **errp) HMODULE module =3D GetModuleHandle("ntdll"); PVOID fun =3D GetProcAddress(module, "RtlGetVersion"); if (fun =3D=3D NULL) { - error_setg(errp, QERR_QGA_COMMAND_FAILED, - "Failed to get address of RtlGetVersion"); + error_setg(errp, "Failed to get address of RtlGetVersion"); return; } =20 diff --git a/qga/commands.c b/qga/commands.c index 88c1c99fe5..27b16313ea 100644 --- a/qga/commands.c +++ b/qga/commands.c @@ -475,7 +475,7 @@ GuestExec *qmp_guest_exec(const char *path, guest_exec_task_setup, &has_merge, &pid, input_data ? &in_fd := NULL, has_output ? &out_fd : NULL, has_output ? &err_fd : NULL, &ger= r); if (!ret) { - error_setg(errp, QERR_QGA_COMMAND_FAILED, gerr->message); + error_setg(errp, "%s", gerr->message); g_error_free(gerr); goto done; } @@ -586,8 +586,7 @@ GuestTimezone *qmp_guest_get_timezone(Error **errp) info =3D g_new0(GuestTimezone, 1); tz =3D g_time_zone_new_local(); if (tz =3D=3D NULL) { - error_setg(errp, QERR_QGA_COMMAND_FAILED, - "Couldn't retrieve local timezone"); + error_setg(errp, "Couldn't retrieve local timezone"); goto error; } =20 --=20 2.45.0