From: Ian Jackson <ian.jackson@eu.citrix.com>
Date: Thu, 16 Jan 2014 17:12:31 +0000 (+0000)
Subject: libxl: fork: assert that chldmode is right
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~5613
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=7916a9023cd8ab159a3d6a870068a35c099d515f;p=xen.git

libxl: fork: assert that chldmode is right

In libxl_childproc_reaped, check that the chldmode is as expected.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Cc: Jim Fehlig <jfehlig@suse.com>
Cc: Ian Campbell <Ian.Campbell@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---

diff --git a/tools/libxl/libxl_fork.c b/tools/libxl/libxl_fork.c
index 7b84765bd1..85db2fbf01 100644
--- a/tools/libxl/libxl_fork.c
+++ b/tools/libxl/libxl_fork.c
@@ -322,6 +322,8 @@ int libxl_childproc_reaped(libxl_ctx *ctx, pid_t pid, int status)
 {
     EGC_INIT(ctx);
     CTX_LOCK;
+    assert(CTX->childproc_hooks->chldowner
+           == libxl_sigchld_owner_mainloop);
     int rc = childproc_reaped(egc, pid, status);
     CTX_UNLOCK;
     EGC_FREE;