122 lines
4.3 KiB
Diff
122 lines
4.3 KiB
Diff
From 457ba062cc1026a88a70ab3cb9a52acd62c5a2a8 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
|
|
Date: Thu, 24 Dec 2020 12:53:02 -0500
|
|
Subject: [PATCH 2/5] qga: rename Error ** parameter to more common errp
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
RH-Author: Marc-André Lureau <marcandre.lureau@redhat.com>
|
|
Message-id: <20201224125304.62697-2-marcandre.lureau@redhat.com>
|
|
Patchwork-id: 100498
|
|
O-Subject: [RHEL-8.4.0 qemu-kvm PATCH 1/3] qga: rename Error ** parameter to more common errp
|
|
Bugzilla: 1910326
|
|
RH-Acked-by: Daniel P. Berrange <berrange@redhat.com>
|
|
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
|
|
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
|
|
|
|
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
|
|
Message-Id: <20191205174635.18758-13-vsementsov@virtuozzo.com>
|
|
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
Reviewed-by: Markus Armbruster <armbru@redhat.com>
|
|
Signed-off-by: Markus Armbruster <armbru@redhat.com>
|
|
|
|
(cherry picked from commit b90abbac0b95f68a7ebac5545ab77b98f598a9c7)
|
|
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
---
|
|
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 c02373cdf7d..29353e90c8f 100644
|
|
--- a/qga/commands-posix.c
|
|
+++ b/qga/commands-posix.c
|
|
@@ -3134,7 +3134,7 @@ static double ga_get_login_time(struct utmpx *user_info)
|
|
return seconds + useconds;
|
|
}
|
|
|
|
-GuestUserList *qmp_guest_get_users(Error **err)
|
|
+GuestUserList *qmp_guest_get_users(Error **errp)
|
|
{
|
|
GHashTable *cache = NULL;
|
|
GuestUserList *head = NULL, *cur_item = NULL;
|
|
diff --git a/qga/commands-win32.c b/qga/commands-win32.c
|
|
index a07725e874b..618ccdfadaa 100644
|
|
--- a/qga/commands-win32.c
|
|
+++ b/qga/commands-win32.c
|
|
@@ -2047,7 +2047,7 @@ typedef struct _GA_WTSINFOA {
|
|
|
|
} GA_WTSINFOA;
|
|
|
|
-GuestUserList *qmp_guest_get_users(Error **err)
|
|
+GuestUserList *qmp_guest_get_users(Error **errp)
|
|
{
|
|
#define QGA_NANOSECONDS 10000000
|
|
|
|
diff --git a/qga/commands.c b/qga/commands.c
|
|
index 0c7d1385c23..43c323ceada 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;
|
|
}
|
|
|
|
-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, Error **err)
|
|
|
|
gei = guest_exec_info_find(pid);
|
|
if (gei == NULL) {
|
|
- error_setg(err, QERR_INVALID_PARAMETER, "pid");
|
|
+ error_setg(errp, QERR_INVALID_PARAMETER, "pid");
|
|
return NULL;
|
|
}
|
|
|
|
@@ -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 = NULL;
|
|
@@ -405,7 +405,7 @@ GuestExec *qmp_guest_exec(const char *path,
|
|
arglist.next = has_arg ? arg : NULL;
|
|
|
|
if (has_input_data) {
|
|
- input = qbase64_decode(input_data, -1, &ninput, err);
|
|
+ input = 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 : NULL,
|
|
has_output ? &out_fd : NULL, has_output ? &err_fd : NULL, &gerr);
|
|
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 **errp)
|
|
return -1;
|
|
}
|
|
|
|
-GuestHostName *qmp_guest_get_host_name(Error **err)
|
|
+GuestHostName *qmp_guest_get_host_name(Error **errp)
|
|
{
|
|
GuestHostName *result = NULL;
|
|
gchar const *hostname = g_get_host_name();
|
|
--
|
|
2.27.0
|
|
|