| Message ID | 1453756017-8747-4-git-send-email-konrad.wilk@oracle.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, 2016-01-25 at 16:06 -0500, Konrad Rzeszutek Wilk wrote: > Describe what the four (or more in the future) arguments > are for. I'd say that a code comment on the definition would be sufficient here, but I'll defer to Ian J as author of this code. > > Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> > --- > tools/libxl/libxl_save_callout.c | 11 ++++++++++- > 1 file changed, 10 insertions(+), 1 deletion(-) > > diff --git a/tools/libxl/libxl_save_callout.c > b/tools/libxl/libxl_save_callout.c > index 3af99af..45b9727 100644 > --- a/tools/libxl/libxl_save_callout.c > +++ b/tools/libxl/libxl_save_callout.c > @@ -119,13 +119,22 @@ void > libxl__save_helper_init(libxl__save_helper_state *shs) > > /*----- helper execution -----*/ > > +/* > + * Both save and restore share four parameters: > + * 1) Path to libxl-save-helper. > + * 2) --[restore|save]-domain. > + * 3) stream file descriptor. > + * n) save/restore specific parameters. > + * 4) A \0 at the end. > + */ > +#define HELPER_NR_ARGS 4 > static void run_helper(libxl__egc *egc, libxl__save_helper_state *shs, > const char *mode_arg, int stream_fd, > const int *preserve_fds, int num_preserve_fds, > const unsigned long *argnums, int num_argnums) > { > STATE_AO_GC(shs->ao); > - const char *args[4 + num_argnums]; > + const char *args[HELPER_NR_ARGS + num_argnums]; > const char **arg = args; > int i, rc; >
Ian Campbell writes ("Re: [PATCH 3/3] tools/libxl: run_helper - add #define for arguments."):
> On Mon, 2016-01-25 at 16:06 -0500, Konrad Rzeszutek Wilk wrote:
> > Describe what the four (or more in the future) arguments
> > are for.
>
> I'd say that a code comment on the definition would be sufficient here, but
> I'll defer to Ian J as author of this code.
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
On Tue, 2016-01-26 at 16:25 +0000, Ian Jackson wrote: > Ian Campbell writes ("Re: [PATCH 3/3] tools/libxl: run_helper - add > #define for arguments."): > > On Mon, 2016-01-25 at 16:06 -0500, Konrad Rzeszutek Wilk wrote: > > > Describe what the four (or more in the future) arguments > > > are for. > > > > I'd say that a code comment on the definition would be sufficient here, > > but > > I'll defer to Ian J as author of this code. > > Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> Applied.
diff --git a/tools/libxl/libxl_save_callout.c b/tools/libxl/libxl_save_callout.c index 3af99af..45b9727 100644 --- a/tools/libxl/libxl_save_callout.c +++ b/tools/libxl/libxl_save_callout.c @@ -119,13 +119,22 @@ void libxl__save_helper_init(libxl__save_helper_state *shs) /*----- helper execution -----*/ +/* + * Both save and restore share four parameters: + * 1) Path to libxl-save-helper. + * 2) --[restore|save]-domain. + * 3) stream file descriptor. + * n) save/restore specific parameters. + * 4) A \0 at the end. + */ +#define HELPER_NR_ARGS 4 static void run_helper(libxl__egc *egc, libxl__save_helper_state *shs, const char *mode_arg, int stream_fd, const int *preserve_fds, int num_preserve_fds, const unsigned long *argnums, int num_argnums) { STATE_AO_GC(shs->ao); - const char *args[4 + num_argnums]; + const char *args[HELPER_NR_ARGS + num_argnums]; const char **arg = args; int i, rc;
Describe what the four (or more in the future) arguments are for. Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> --- tools/libxl/libxl_save_callout.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)