Re: [Xen-devel] [PATCH 3/3] xl/libxl: make shutdown accept the long option --wait for -w

[Ian Campbell <Ian.Campbell@xxxxxxxxxx>]

On Thu, 2012-10-11 at 09:25 +0100, linux@xxxxxxxxxxxxxx wrote:
> From: Sander Eikelenboom <linux@xxxxxxxxxxxxxx>
> 
> Make xl/libxl accept the long option --wait for -w to be compatible with xm.
> The long options are used in the default init and sysconfig scripts
> 
> Signed-off-by: Sander Eikelenboom <linux@xxxxxxxxxxxxxx>
> ---
>  docs/man/xl.pod.1         |    2 +-
>  tools/libxl/xl_cmdimpl.c  |    7 ++++++-
>  tools/libxl/xl_cmdtable.c |    2 +-
>  3 files changed, 8 insertions(+), 3 deletions(-)
> 
> diff --git a/docs/man/xl.pod.1 b/docs/man/xl.pod.1
> index 25ce777..dd387c9 100644
> --- a/docs/man/xl.pod.1
> +++ b/docs/man/xl.pod.1
> @@ -550,7 +550,7 @@ B<OPTIONS>
>  
>  =over 4
>  
> -=item B<-w>
> +=item B<-w>, B<--wait>
>  
>  Wait for the domain to complete shutdown before returning.
>  
> diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c
> index 93066d3..768ba1f 100644
> --- a/tools/libxl/xl_cmdimpl.c
> +++ b/tools/libxl/xl_cmdimpl.c
> @@ -3709,8 +3709,13 @@ int main_shutdown(int argc, char **argv)
>      int opt;
>      int wait_for_it = 0;
>      int fallback_trigger = 0;
> +    int option_index = 0;
> +    static struct option long_options[] = {
> +        {"wait", 0, 0, 'w'},
> +        {0, 0, 0, 0}
> +    };
>  
> -    while ((opt = def_getopt(argc, argv, "wF", "shutdown", 1)) != -1) {
> +    while ((opt = getopt_long(argc, argv, "wF", long_options, 
> &option_index)) != -1) {

Since you don't use it you can pass NULL instead of &option_index.

>          switch (opt) {
>          case 0: case 2:
>              return opt;
> diff --git a/tools/libxl/xl_cmdtable.c b/tools/libxl/xl_cmdtable.c
> index 85ea768..b398c0a 100644
> --- a/tools/libxl/xl_cmdtable.c
> +++ b/tools/libxl/xl_cmdtable.c
> @@ -64,7 +64,7 @@ struct cmd_spec cmd_table[] = {
>        "-h                      Print this help.\n"
>        "-F                      Fallback to ACPI power event for HVM guests 
> with\n"
>        "                        no PV drivers.\n"
> -      "-w                      Wait for guest to shutdown.\n"
> +      "-w, --wait              Wait for guest to shutdown.\n"
>      },
>      { "reboot",
>        &main_reboot, 0, 1,



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