| Message ID | 1484309880-9819-1-git-send-email-wei.liu2@citrix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 13/01/17 13:18, Wei Liu wrote: > The only place that used such option was removed in 388d3011. > > Signed-off-by: Wei Liu <wei.liu2@citrix.com> Reviewed-by: Juergen Gross <jgross@suse.com> > --- > Cc: Juergen Gross <jgross@suse.com> > Cc: Ian Jackson <ian.jackson@eu.citrix.com> > --- > tools/xenstore/xenstored_core.c | 6 ------ > 1 file changed, 6 deletions(-) > > diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c > index 3dc06d4..70d61b4 100644 > --- a/tools/xenstore/xenstored_core.c > +++ b/tools/xenstore/xenstored_core.c > @@ -77,7 +77,6 @@ static bool verbose = false; > LIST_HEAD(connections); > static int tracefd = -1; > static bool recovery = true; > -static bool remove_local = true; > static int reopen_log_pipe[2]; > static int reopen_log_pipe0_pollfd_idx = -1; > static char *tracefile = NULL; > @@ -1904,7 +1903,6 @@ static void usage(void) > " -R, --no-recovery to request that no recovery should be attempted when\n" > " the store is corrupted (debug only),\n" > " -I, --internal-db store database in memory, not on disk\n" > -" -L, --preserve-local to request that /local is preserved on start-up,\n" > " -M, --memory-debug <file> support memory debugging to file,\n" > " -V, --verbose to request verbose execution.\n"); > } > @@ -1924,7 +1922,6 @@ static struct option options[] = { > { "trace-file", 1, NULL, 'T' }, > { "transaction", 1, NULL, 't' }, > { "no-recovery", 0, NULL, 'R' }, > - { "preserve-local", 0, NULL, 'L' }, > { "internal-db", 0, NULL, 'I' }, > { "verbose", 0, NULL, 'V' }, > { "watch-nb", 1, NULL, 'W' }, > @@ -1972,9 +1969,6 @@ int main(int argc, char *argv[]) You failed to remove the 'L' from getopt_long() 3rd parameter: "DE:F:HNPS:t:T:RLVW:M:" -> "DE:F:HNPS:t:T:RVW:M:" > case 'R': > recovery = false; > break; > - case 'L': > - remove_local = false; > - break; > case 'S': > quota_max_entry_size = strtol(optarg, NULL, 10); > break; > Juergen
On 13/01/17 14:31, Juergen Gross wrote: > On 13/01/17 13:18, Wei Liu wrote: >> The only place that used such option was removed in 388d3011. >> >> Signed-off-by: Wei Liu <wei.liu2@citrix.com> > > Reviewed-by: Juergen Gross <jgross@suse.com> Sorry, this stands only if you do the change I mentioned below. > >> --- >> Cc: Juergen Gross <jgross@suse.com> >> Cc: Ian Jackson <ian.jackson@eu.citrix.com> >> --- >> tools/xenstore/xenstored_core.c | 6 ------ >> 1 file changed, 6 deletions(-) >> >> diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c >> index 3dc06d4..70d61b4 100644 >> --- a/tools/xenstore/xenstored_core.c >> +++ b/tools/xenstore/xenstored_core.c >> @@ -77,7 +77,6 @@ static bool verbose = false; >> LIST_HEAD(connections); >> static int tracefd = -1; >> static bool recovery = true; >> -static bool remove_local = true; >> static int reopen_log_pipe[2]; >> static int reopen_log_pipe0_pollfd_idx = -1; >> static char *tracefile = NULL; >> @@ -1904,7 +1903,6 @@ static void usage(void) >> " -R, --no-recovery to request that no recovery should be attempted when\n" >> " the store is corrupted (debug only),\n" >> " -I, --internal-db store database in memory, not on disk\n" >> -" -L, --preserve-local to request that /local is preserved on start-up,\n" >> " -M, --memory-debug <file> support memory debugging to file,\n" >> " -V, --verbose to request verbose execution.\n"); >> } >> @@ -1924,7 +1922,6 @@ static struct option options[] = { >> { "trace-file", 1, NULL, 'T' }, >> { "transaction", 1, NULL, 't' }, >> { "no-recovery", 0, NULL, 'R' }, >> - { "preserve-local", 0, NULL, 'L' }, >> { "internal-db", 0, NULL, 'I' }, >> { "verbose", 0, NULL, 'V' }, >> { "watch-nb", 1, NULL, 'W' }, >> @@ -1972,9 +1969,6 @@ int main(int argc, char *argv[]) > > You failed to remove the 'L' from getopt_long() 3rd parameter: > "DE:F:HNPS:t:T:RLVW:M:" -> "DE:F:HNPS:t:T:RVW:M:" Juergen
On Fri, Jan 13, 2017 at 02:38:21PM +0100, Juergen Gross wrote: > On 13/01/17 14:31, Juergen Gross wrote: > > On 13/01/17 13:18, Wei Liu wrote: > >> The only place that used such option was removed in 388d3011. > >> > >> Signed-off-by: Wei Liu <wei.liu2@citrix.com> > > > > Reviewed-by: Juergen Gross <jgross@suse.com> > > Sorry, this stands only if you do the change I mentioned below. > Applied.
diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index 3dc06d4..70d61b4 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -77,7 +77,6 @@ static bool verbose = false; LIST_HEAD(connections); static int tracefd = -1; static bool recovery = true; -static bool remove_local = true; static int reopen_log_pipe[2]; static int reopen_log_pipe0_pollfd_idx = -1; static char *tracefile = NULL; @@ -1904,7 +1903,6 @@ static void usage(void) " -R, --no-recovery to request that no recovery should be attempted when\n" " the store is corrupted (debug only),\n" " -I, --internal-db store database in memory, not on disk\n" -" -L, --preserve-local to request that /local is preserved on start-up,\n" " -M, --memory-debug <file> support memory debugging to file,\n" " -V, --verbose to request verbose execution.\n"); } @@ -1924,7 +1922,6 @@ static struct option options[] = { { "trace-file", 1, NULL, 'T' }, { "transaction", 1, NULL, 't' }, { "no-recovery", 0, NULL, 'R' }, - { "preserve-local", 0, NULL, 'L' }, { "internal-db", 0, NULL, 'I' }, { "verbose", 0, NULL, 'V' }, { "watch-nb", 1, NULL, 'W' }, @@ -1972,9 +1969,6 @@ int main(int argc, char *argv[]) case 'R': recovery = false; break; - case 'L': - remove_local = false; - break; case 'S': quota_max_entry_size = strtol(optarg, NULL, 10); break;
The only place that used such option was removed in 388d3011. Signed-off-by: Wei Liu <wei.liu2@citrix.com> --- Cc: Juergen Gross <jgross@suse.com> Cc: Ian Jackson <ian.jackson@eu.citrix.com> --- tools/xenstore/xenstored_core.c | 6 ------ 1 file changed, 6 deletions(-)