diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2010-01-12 07:04:46 +0000 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2010-01-12 07:04:46 +0000 |
| commit | 02bc3705910bcee69389e2948454ead894608277 (patch) | |
| tree | 317cd2664563c6415bf83a67180033a677304155 | |
| parent | bfc7ebaee1ea03b8f2029abd98596a0b9f132ce3 (diff) | |
| download | xen-02bc3705910bcee69389e2948454ead894608277.tar.gz xen-02bc3705910bcee69389e2948454ead894608277.tar.bz2 xen-02bc3705910bcee69389e2948454ead894608277.zip | |
libxenlight: typo in old patch, lead to waitpid forever instead of
waitpid with WNOHANG
fixes qemu starting problem
Signed-off-by: Vincent Hanquez <vincent.hanquez@eu.citrix.com>
| -rw-r--r-- | tools/libxl/libxl_exec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/libxl/libxl_exec.c b/tools/libxl/libxl_exec.c index ba92019e4b..1588a1f547 100644 --- a/tools/libxl/libxl_exec.c +++ b/tools/libxl/libxl_exec.c @@ -45,7 +45,7 @@ static pid_t libxl_fork(struct libxl_ctx *ctx) static int call_waitpid(pid_t (*waitpid_cb)(pid_t, int *, int), pid_t pid, int *status, int options) { - return (waitpid_cb) ? waitpid_cb(pid, status, 0) : waitpid(pid, status, 0); + return (waitpid_cb) ? waitpid_cb(pid, status, options) : waitpid(pid, status, options); } void libxl_exec(struct libxl_ctx *ctx, int stdinfd, int stdoutfd, int stderrfd, @@ -202,7 +202,7 @@ int libxl_spawn_check(struct libxl_ctx *ctx, void *for_spawn_void) if (!for_spawn) return 0; assert(for_spawn->intermediate); - got = call_waitpid(ctx->waitpid_instead, for_spawn->intermediate, &status, 0); + got = call_waitpid(ctx->waitpid_instead, for_spawn->intermediate, &status, WNOHANG); if (!got) return 0; assert(got == for_spawn->intermediate); |