George Dunlap
2012-May-15 15:49 UTC
[PATCH] xl: Fixup filename->source after 25344:0f3b1e13d6af
Because of conflicts with another patch, changeset 25344:0f3b1e13d6af missed
one change.
Signed-off-by: George Dunlap <george.dunlap@eu.citrix.com>
diff -r ec972fec40a3 -r 99244350516a tools/libxl/xl_cmdimpl.c
--- a/tools/libxl/xl_cmdimpl.c Tue May 15 16:28:16 2012 +0100
+++ b/tools/libxl/xl_cmdimpl.c Tue May 15 16:48:49 2012 +0100
@@ -1931,7 +1931,7 @@ start:
/* Reparse the configuration in case it has changed */
libxl_domain_config_dispose(&d_config);
libxl_domain_config_init(&d_config);
- parse_config_data(config_file, config_data, config_len,
+ parse_config_data(config_source, config_data, config_len,
&d_config, dom_info);
/*
Ian Campbell
2012-May-15 16:04 UTC
Re: [PATCH] xl: Fixup filename->source after 25344:0f3b1e13d6af
On Tue, 2012-05-15 at 16:49 +0100, George Dunlap wrote:> Because of conflicts with another patch, changeset 25344:0f3b1e13d6af missed > one change. > > Signed-off-by: George Dunlap <george.dunlap@eu.citrix.com>Committed-by: Ian Campbell <ian.campbell@citrix.com> I don''t think this hunk was actually in the patch I applied as 25344:0f3b1e13d6af in the first place. Did you originally write this patch prior to 25128:40efd7d36d46 by any chance?> diff -r ec972fec40a3 -r 99244350516a tools/libxl/xl_cmdimpl.c > --- a/tools/libxl/xl_cmdimpl.c Tue May 15 16:28:16 2012 +0100 > +++ b/tools/libxl/xl_cmdimpl.c Tue May 15 16:48:49 2012 +0100 > @@ -1931,7 +1931,7 @@ start: > /* Reparse the configuration in case it has changed */ > libxl_domain_config_dispose(&d_config); > libxl_domain_config_init(&d_config); > - parse_config_data(config_file, config_data, config_len, > + parse_config_data(config_source, config_data, config_len, > &d_config, dom_info); > > /* > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel
George Dunlap
2012-May-15 16:16 UTC
Re: [PATCH] xl: Fixup filename->source after 25344:0f3b1e13d6af
On 15/05/12 17:04, Ian Campbell wrote:> On Tue, 2012-05-15 at 16:49 +0100, George Dunlap wrote: >> Because of conflicts with another patch, changeset 25344:0f3b1e13d6af missed >> one change. >> >> Signed-off-by: George Dunlap<george.dunlap@eu.citrix.com> > Committed-by: Ian Campbell<ian.campbell@citrix.com> > > I don''t think this hunk was actually in the patch I applied as > 25344:0f3b1e13d6af in the first place. Did you originally write this > patch prior to 25128:40efd7d36d46 by any chance?Strange -- no, I''m pretty sure my first patches were after that; and I thought that I had done a search for "file" at my previous refresh two weeks ago and satisfied myself that all the variable names were used properly. But you''re right, it''s not in the patch I sent. :-/ -G