From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: [PATCH 3 of 4] libxl: pass libxl__spawn_starting to libxl__spawn_spawn Date: Wed, 4 May 2011 15:51:11 +0100 Message-ID: References: Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com Cc: Bastian Blank List-Id: xen-devel@lists.xenproject.org # HG changeset patch # User Ian Campbell # Date 1304516241 -3600 # Node ID ec008dc43727191f472cd4bd5e59d9d35d9d36c2 # Parent cba88f487f7c5a2d08b0dd5a484c0895c6dee17f libxl: pass libxl__spawn_starting to libxl__spawn_spawn. Passing a libxl__device_model_starting to a generic function and expecting it to scrobble inside for the generic data structure is a strange interface. Instead pass in a libxl__spawn_starting and an opaque hook data pointer. The for_spawn member of libxl__device_model_starting was annotated with "first!", suggesting that someone intended to use pointer casting tricks to move between the outer and inner struct. However the field is a pointer not a inline struct so this doesn't work (and it isn't used this way anyhow). Remove the comment, and move the field away from the front for good measure. Signed-off-by: Ian Campbell diff -r cba88f487f7c -r ec008dc43727 tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Wed May 04 14:37:20 2011 +0100 +++ b/tools/libxl/libxl_dm.c Wed May 04 14:37:21 2011 +0100 @@ -825,7 +825,8 @@ retry_transaction: } } - rc = libxl__spawn_spawn(gc, p, "device model", dm_xenstore_record_pid); + rc = libxl__spawn_spawn(gc, p->for_spawn, "device model", + dm_xenstore_record_pid, p); if (rc < 0) goto out_close; if (!rc) { /* inner child */ diff -r cba88f487f7c -r ec008dc43727 tools/libxl/libxl_exec.c --- a/tools/libxl/libxl_exec.c Wed May 04 14:37:20 2011 +0100 +++ b/tools/libxl/libxl_exec.c Wed May 04 14:37:21 2011 +0100 @@ -92,16 +92,16 @@ void libxl_report_child_exitstatus(libxl } int libxl__spawn_spawn(libxl__gc *gc, - libxl__device_model_starting *starting, + libxl__spawn_starting *for_spawn, const char *what, void (*intermediate_hook)(void *for_spawn, - pid_t innerchild)) + pid_t innerchild), + void *hook_data) { libxl_ctx *ctx = libxl__gc_owner(gc); pid_t child, got; int status; pid_t intermediate; - libxl__spawn_starting *for_spawn = starting->for_spawn; if (for_spawn) { for_spawn->what = strdup(what); @@ -127,7 +127,7 @@ int libxl__spawn_spawn(libxl__gc *gc, if (!child) return 0; /* caller runs child code */ - intermediate_hook(starting, child); + intermediate_hook(hook_data, child); if (!for_spawn) _exit(0); /* just detach then */ diff -r cba88f487f7c -r ec008dc43727 tools/libxl/libxl_internal.h --- a/tools/libxl/libxl_internal.h Wed May 04 14:37:20 2011 +0100 +++ b/tools/libxl/libxl_internal.h Wed May 04 14:37:21 2011 +0100 @@ -237,9 +237,9 @@ typedef struct { } libxl__spawn_starting; typedef struct { - libxl__spawn_starting *for_spawn; /* first! */ char *dom_path; /* from libxl_malloc, only for dm_xenstore_record_pid */ int domid; + libxl__spawn_starting *for_spawn; } libxl__device_model_starting; /* from xl_create */ @@ -277,9 +277,10 @@ _hidden int libxl__wait_for_device_model void *check_callback_userdata); _hidden int libxl__spawn_spawn(libxl__gc *gc, - libxl__device_model_starting *starting, + libxl__spawn_starting *starting, const char *what, - void (*intermediate_hook)(void *for_spawn, pid_t innerchild)); + void (*intermediate_hook)(void *for_spawn, pid_t innerchild), + void *hook_data); _hidden int libxl__destroy_device_model(libxl__gc *gc, uint32_t domid); /* Logs errors. A copy of "what" is taken. Return values: