Message ID | 20191205174635.18758-13-vsementsov@virtuozzo.com |
---|---|
State | New |
Headers | show |
Series | error: prepare for auto propagated local_err | expand |
On 12/5/19 6:46 PM, Vladimir Sementsov-Ogievskiy wrote: > Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@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 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_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 55ba5b263a..2461fd19bf 100644 > --- a/qga/commands-win32.c > +++ b/qga/commands-win32.c > @@ -1946,7 +1946,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 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; > } > > -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(); >
Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> writes: > Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> Reviewed-by: Markus Armbruster <armbru@redhat.com>
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_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 55ba5b263a..2461fd19bf 100644 --- a/qga/commands-win32.c +++ b/qga/commands-win32.c @@ -1946,7 +1946,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 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; } -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();
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> --- qga/commands-posix.c | 2 +- qga/commands-win32.c | 2 +- qga/commands.c | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-)