Re: [Xen-devel] [PATCH 2 of 4 v2] xl: Check for duplicate vncdisplay options, and return an error

[Ian Campbell <Ian.Campbell@xxxxxxxxxx>]

(seems that I forgot to hit send on this yesterday) 

On Fri, 2012-11-30 at 16:24 +0000, George Dunlap wrote:
> # HG changeset patch
> # User George Dunlap <george.dunlap@xxxxxxxxxxxxx>
> # Date 1354291984 0
> # Node ID fa37bd276212a01e3c898b54a7f2385454c406a7
> # Parent  722da032ac90c0e1a78b1154fa588bf295d1f009
> xl: Check for duplicate vncdisplay options, and return an error
> 
> If the user has set a vnc display number both in vnclisten (with
> "xxxx:yy"), and with vncdisplay, throw an error.
> 
> Update man pages to match.
> 
> Signed-off-by: George Dunlap <george.dunlap@xxxxxxxxxxxxx>

Kind of nasty that we are stuck with both at the libxl interface, but oh
well, to late now...

Acked + applied, thanks.

> 
> diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5
> --- a/docs/man/xl.cfg.pod.5
> +++ b/docs/man/xl.cfg.pod.5
> @@ -350,11 +350,17 @@ other VNC-related settings.  The default
>  
>  Specifies the IP address, and optionally VNC display number, to use.
>  
> +NB that if you specify the display number here, you should not use
> +vncdisplay.
> +
>  =item C<vncdisplay=DISPLAYNUM>
>  
>  Specifies the VNC display number to use.  The actual TCP port number
>  will be DISPLAYNUM+5900.
>  
> +NB that you should not use this option if you set the displaynum in the 
> +vnclisten string.
> +
>  =item C<vncunused=BOOLEAN>
>  
>  Requests that the VNC display setup search for a free TCP port to use.
> diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c
> --- a/tools/libxl/xl_cmdimpl.c
> +++ b/tools/libxl/xl_cmdimpl.c
> @@ -1257,6 +1257,7 @@ skip_nic:
>                      vfb->sdl.xauthority = strdup(p2 + 1);
>                  }
>              } while ((p = strtok(NULL, ",")) != NULL);
> +
>  skip_vfb:
>              free(buf2);
>              d_config->num_vfbs++;
> @@ -1490,6 +1491,16 @@ skip_vfb:
>          xlu_cfg_replace_string (config, "soundhw", &b_info->u.hvm.soundhw, 
> 0);
>          xlu_cfg_get_defbool(config, "xen_platform_pci",
>                              &b_info->u.hvm.xen_platform_pci, 0);
> +
> +        if(b_info->u.hvm.vnc.listen
> +           && b_info->u.hvm.vnc.display
> +           && strchr(b_info->u.hvm.vnc.listen, ':') != NULL) {
> +            fprintf(stderr,
> +                    "ERROR: Display specified both in vnclisten"
> +                    " and vncdisplay!\n");
> +            exit (1);
> +            
> +        }
>      }
>  
>      xlu_cfg_destroy(config);
> 
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@xxxxxxxxxxxxx
> http://lists.xen.org/xen-devel



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