mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qga/commands-posix: Make ga_wait_child() return boolean

Browse Source 
Make ga_wait_child() return boolean and check the returned boolean
in ga_run_command() instead of dereferencing @errp.

Cc: Michael Roth <michael.roth@amd.com>
Cc: Konstantin Kostiuk <kkostiuk@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
Reviewed-by: Konstantin Kostiuk <kkostiuk@redhat.com>
Message-ID: <20240716162351.270095-1-zhao1.liu@intel.com>
Signed-off-by: Konstantin Kostiuk <kkostiuk@redhat.com>
This commit is contained in:
Zhao Liu 2024-07-17 00:23:51 +08:00 committed by Konstantin Kostiuk
parent 2e3b166c41
commit 1d523869d7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qga/commands-posix.c
View File

@ -48,7 +48,7 @@
#endif #endif
#endif #endif
static void ga_wait_child(pid_t pid, int *status, Error **errp) static bool ga_wait_child(pid_t pid, int *status, Error **errp)
{ {
pid_t rpid; pid_t rpid;
@ -59,10 +59,11 @@ static void ga_wait_child(pid_t pid, int *status, Error **errp)
if (rpid == -1) { if (rpid == -1) {
error_setg_errno(errp, errno, "failed to wait for child (pid: %d)", error_setg_errno(errp, errno, "failed to wait for child (pid: %d)",
pid); pid);
return; return false;
} }
g_assert(rpid == pid); g_assert(rpid == pid);
return true;
} }
static ssize_t ga_pipe_read_str(int fd[2], char **str) static ssize_t ga_pipe_read_str(int fd[2], char **str)
@ -167,8 +168,7 @@ static int ga_run_command(const char *argv[], const char *in_str,
goto out; goto out;
} }
ga_wait_child(pid, &status, errp); if (!ga_wait_child(pid, &status, errp)) {
if (*errp) {
goto out; goto out;
} }