All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] xenstored: remove -L option
@ 2017-01-13 12:18 Wei Liu
  2017-01-13 13:31 ` Juergen Gross
  0 siblings, 1 reply; 4+ messages in thread
From: Wei Liu @ 2017-01-13 12:18 UTC (permalink / raw)
  To: Xen-devel; +Cc: Juergen Gross, Ian Jackson, Wei Liu

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(-)

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;
-- 
2.1.4


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH] xenstored: remove -L option
  2017-01-13 12:18 [PATCH] xenstored: remove -L option Wei Liu
@ 2017-01-13 13:31 ` Juergen Gross
  2017-01-13 13:38   ` Juergen Gross
  0 siblings, 1 reply; 4+ messages in thread
From: Juergen Gross @ 2017-01-13 13:31 UTC (permalink / raw)
  To: Wei Liu, Xen-devel; +Cc: Ian Jackson

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


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] xenstored: remove -L option
  2017-01-13 13:31 ` Juergen Gross
@ 2017-01-13 13:38   ` Juergen Gross
  2017-01-16 17:33     ` Wei Liu
  0 siblings, 1 reply; 4+ messages in thread
From: Juergen Gross @ 2017-01-13 13:38 UTC (permalink / raw)
  To: Wei Liu, Xen-devel; +Cc: Ian Jackson

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


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] xenstored: remove -L option
  2017-01-13 13:38   ` Juergen Gross
@ 2017-01-16 17:33     ` Wei Liu
  0 siblings, 0 replies; 4+ messages in thread
From: Wei Liu @ 2017-01-16 17:33 UTC (permalink / raw)
  To: Juergen Gross; +Cc: Xen-devel, Wei Liu, Ian Jackson

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.

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2017-01-16 17:33 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-13 12:18 [PATCH] xenstored: remove -L option Wei Liu
2017-01-13 13:31 ` Juergen Gross
2017-01-13 13:38   ` Juergen Gross
2017-01-16 17:33     ` Wei Liu

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.