From nobody Sat Apr 27 14:19:12 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; 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=fail(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1574883174; cv=none; d=zohomail.com; s=zohoarc; b=JqCv0FhJhu6po9a/b5F7bTew/TVCSXRoVw2jdw5KwoMLwvIZ50pzEF+82i1JzsU6+z3YtCUscfz27rgwo8geXQ07tFFsVB8yreOGKbwqORdefzpnnOskLTYo+X1EFCqPh+TivazjMy20vNGidVAsNR7wUHjk7MmfcSW5edvXBmM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1574883174; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=xbf3lEnEr89AInG8QTZql48EPPdpRmRdBJLuo5KfZx0=; b=G2sk1a1bif1wEwkjb/dvdmNmXUwI7BdHiJGbWbeYCi5VaKu43R7KedbwmyIVWVoHss0Z8ZC+NwJGMsY87JKhUtSeOKj2erXjggVcELuYA/37PzIvnbuGJt/qADH0tOGf2e3dDGtPDpVf/0q2yfHgnBUr6hw3MUGRcP4eEy6k4nY= ARC-Authentication-Results: i=1; mx.zohomail.com; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1574883174810520.3453844773918; Wed, 27 Nov 2019 11:32:54 -0800 (PST) Received: from localhost ([::1]:42202 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ia33V-0001ul-B7 for importer@patchew.org; Wed, 27 Nov 2019 14:32:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41015) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ia30i-0000ea-LH for qemu-devel@nongnu.org; Wed, 27 Nov 2019 14:30:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ia30f-0003Jd-V5 for qemu-devel@nongnu.org; Wed, 27 Nov 2019 14:30:00 -0500 Received: from relay.sw.ru ([185.231.240.75]:54638) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ia30f-0003Eq-MC for qemu-devel@nongnu.org; Wed, 27 Nov 2019 14:29:57 -0500 Received: from vovaso.qa.sw.ru ([10.94.3.0] helo=kvm.qa.sw.ru) by relay.sw.ru with esmtp (Exim 4.92.3) (envelope-from ) id 1ia30W-0004MZ-Vm; Wed, 27 Nov 2019 22:29:49 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org Subject: [PATCH v6] qga: rename Error ** parameter to more common errp Date: Wed, 27 Nov 2019 22:29:48 +0300 Message-Id: <20191127192948.22266-1-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 185.231.240.75 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: vsementsov@virtuozzo.com, mdroth@linux.vnet.ibm.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Signed-off-by: Vladimir Sementsov-Ogievskiy --- qga/commands-posix.c | 2 +- qga/commands-win32.c | 2 +- qga/commands.c | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qga/commands-posix.c b/qga/commands-posix.c index 1c1a165dae..3bd7b54c08 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -2781,7 +2781,7 @@ static double ga_get_login_time(struct utmpx *user_in= fo) return seconds + useconds; } =20 -GuestUserList *qmp_guest_get_users(Error **err) +GuestUserList *qmp_guest_get_users(Error **errp) { GHashTable *cache =3D NULL; GuestUserList *head =3D NULL, *cur_item =3D NULL; diff --git a/qga/commands-win32.c b/qga/commands-win32.c index 55ba5b263a..2461fd19bf 100644 --- a/qga/commands-win32.c +++ b/qga/commands-win32.c @@ -1946,7 +1946,7 @@ typedef struct _GA_WTSINFOA { =20 } GA_WTSINFOA; =20 -GuestUserList *qmp_guest_get_users(Error **err) +GuestUserList *qmp_guest_get_users(Error **errp) { #define QGA_NANOSECONDS 10000000 =20 diff --git a/qga/commands.c b/qga/commands.c index 0c7d1385c2..43c323cead 100644 --- a/qga/commands.c +++ b/qga/commands.c @@ -143,7 +143,7 @@ static GuestExecInfo *guest_exec_info_find(int64_t pid_= numeric) return NULL; } =20 -GuestExecStatus *qmp_guest_exec_status(int64_t pid, Error **err) +GuestExecStatus *qmp_guest_exec_status(int64_t pid, Error **errp) { GuestExecInfo *gei; GuestExecStatus *ges; @@ -152,7 +152,7 @@ GuestExecStatus *qmp_guest_exec_status(int64_t pid, Err= or **err) =20 gei =3D guest_exec_info_find(pid); if (gei =3D=3D NULL) { - error_setg(err, QERR_INVALID_PARAMETER, "pid"); + error_setg(errp, QERR_INVALID_PARAMETER, "pid"); return NULL; } =20 @@ -385,7 +385,7 @@ GuestExec *qmp_guest_exec(const char *path, bool has_env, strList *env, bool has_input_data, const char *input_data, bool has_capture_output, bool capture_output, - Error **err) + Error **errp) { GPid pid; GuestExec *ge =3D NULL; @@ -405,7 +405,7 @@ GuestExec *qmp_guest_exec(const char *path, arglist.next =3D has_arg ? arg : NULL; =20 if (has_input_data) { - input =3D qbase64_decode(input_data, -1, &ninput, err); + input =3D qbase64_decode(input_data, -1, &ninput, errp); if (!input) { return NULL; } @@ -424,7 +424,7 @@ GuestExec *qmp_guest_exec(const char *path, guest_exec_task_setup, NULL, &pid, has_input_data ? &in_fd : N= ULL, has_output ? &out_fd : NULL, has_output ? &err_fd : NULL, &ger= r); if (!ret) { - error_setg(err, QERR_QGA_COMMAND_FAILED, gerr->message); + error_setg(errp, QERR_QGA_COMMAND_FAILED, gerr->message); g_error_free(gerr); goto done; } @@ -499,7 +499,7 @@ int ga_parse_whence(GuestFileWhence *whence, Error **er= rp) return -1; } =20 -GuestHostName *qmp_guest_get_host_name(Error **err) +GuestHostName *qmp_guest_get_host_name(Error **errp) { GuestHostName *result =3D NULL; gchar const *hostname =3D g_get_host_name(); --=20 2.21.0